valitydev/thrift
14
0
Fork 0
mirror of https://github.com/valitydev/thrift.git synced 2024-11-07 02:45:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

replace boost unique_ptr with std::unique_ptr

Browse Source
This commit is contained in:
cyy 2019-01-06 10:17:35 +08:00 committed by James E. King III
parent 7007506960
commit 77d26e2e5c
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/cpp/src/thrift/transport/TFileTransport.cpp
View File

@ -25,13 +25,6 @@
#include <thrift/concurrency/FunctionRunner.h>
#include <boost/version.hpp>
#if (BOOST_VERSION >= 105700)
#include <boost/move/unique_ptr.hpp>
using boost::movelib::unique_ptr;
#else
#include <boost/interprocess/smart_ptr/unique_ptr.hpp>
using boost::interprocess::unique_ptr;
#endif
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
@ -49,6 +42,7 @@ using boost::interprocess::unique_ptr;
#include <cstring>
#include <iostream>
#include <limits>
#include <memory>
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
@ -203,8 +197,6 @@ void TFileTransport::write(const uint8_t* buf, uint32_t len) {
enqueueEvent(buf, len);
}
// this is needed until boost 1.57 as the older unique_ptr implementation
// has no default deleter in interprocess
template <class _T>
struct uniqueDeleter
{
@ -228,7 +220,7 @@ void TFileTransport::enqueueEvent(const uint8_t* buf, uint32_t eventLen) {
return;
}
unique_ptr<eventInfo, uniqueDeleter<eventInfo> > toEnqueue(new eventInfo());
std::unique_ptr<eventInfo, uniqueDeleter<eventInfo> > toEnqueue(new eventInfo());
toEnqueue->eventBuff_ = new uint8_t[(sizeof(uint8_t) * eventLen) + 4];
// first 4 bytes is the event length