mmr/Livox-SDK
Archived
1
0
Fork 0
Code Issues 105 Pull Requests 11 Actions Packages Projects Releases 9 Wiki Activity

feat:replace boost library with C++11 std library

Browse Source
This commit is contained in:
Livox-SDK
2020-04-01 20:53:55 +08:00
parent 6d06233944
commit d3258bbd97
1936 changed files with 241862 additions and 60153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdk_core/src/device_discovery.h
+5 -5
View File
@@ -25,7 +25,7 @@
#ifndef LIVOX_DEVICE_DISCOVERY_
#define LIVOX_DEVICE_DISCOVERY_
#include <boost/thread/mutex.hpp>
#include <mutex>
#include <string>
#include "apr_general.h"
#include "apr_network_io.h"
@@ -43,7 +43,7 @@ namespace livox {
*/
class DeviceDiscovery : public noncopyable, IOLoop::IOLoopDelegate {
public:
DeviceDiscovery() : sock_(NULL), mem_pool_(NULL), loop_(NULL), comm_port_(NULL) {}
DeviceDiscovery() : sock_(NULL), mem_pool_(NULL), loop_(NULL), comm_port_(nullptr) {}
bool Init();
void Uninit();
@@ -79,9 +79,9 @@ class DeviceDiscovery : public noncopyable, IOLoop::IOLoopDelegate {
apr_socket_t *sock_;
apr_pool_t *mem_pool_;
IOLoop *loop_;
boost::scoped_ptr<CommPort> comm_port_;
boost::mutex mutex_;
typedef std::map<apr_socket_t *, boost::tuple<apr_pool_t *, apr_time_t, DeviceInfo> > ConnectingDeviceMap;
std::unique_ptr<CommPort> comm_port_;
std::mutex mutex_;
typedef std::map<apr_socket_t *, std::tuple<apr_pool_t *, apr_time_t, DeviceInfo> > ConnectingDeviceMap;
ConnectingDeviceMap connecting_devices_;
};