Skip to content

Commit 09effe7

Browse files
zd-doublezd-double
committed
Update smart_ptr
1 parent f9877d6 commit 09effe7

40 files changed

+104
-102
lines changed

‎Makefile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,10 @@ build: $(LIB) $(BIN)
122122
install: $(LIB) $(BIN)
123123
mkdir -p $(PREFIX)/include/sofa/pbrpc
124124
cp -r $(PUB_INC) $(TARGET_DIRECTORY) $(PREFIX)/include/sofa/pbrpc/
125-
mkdir -p $(PREFIX)/include/sofa/pbrpc/boost/smart_ptr
126-
cp src/sofa/pbrpc/boost/smart_ptr/*.hpp $(PREFIX)/include/sofa/pbrpc/boost/smart_ptr
127-
mkdir -p $(PREFIX)/include/sofa/pbrpc/boost/smart_ptr/detail
128-
cp src/sofa/pbrpc/boost/smart_ptr/detail/*.hpp $(PREFIX)/include/sofa/pbrpc/boost/smart_ptr/detail
129-
cp src/sofa/pbrpc/boost/smart_ptr.hpp $(PREFIX)/include/sofa/pbrpc/boost
125+
mkdir -p $(PREFIX)/include/sofa/pbrpc/smart_ptr
126+
cp src/sofa/pbrpc/smart_ptr/*.hpp $(PREFIX)/include/sofa/pbrpc/smart_ptr
127+
mkdir -p $(PREFIX)/include/sofa/pbrpc/smart_ptr/detail
128+
cp src/sofa/pbrpc/smart_ptr/detail/*.hpp $(PREFIX)/include/sofa/pbrpc/smart_ptr/detail
130129
mkdir -p $(PREFIX)/lib
131130
cp $(LIB) $(PREFIX)/lib/
132131
mkdir -p $(PREFIX)/bin

‎README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ For more details, please refer to the wiki [Build Guide](https://github.com/baid
5151
### Sample
5252
For sample code, please refer to ['./sample'](https://github.com/baidu/sofa-pbrpc/tree/master/sample) and the wiki [Quick Start](https://github.com/baidu/sofa-pbrpc/wiki/%E5%BF%AB%E9%80%9F%E4%BD%BF%E7%94%A8).
5353

54+
### Profiling
55+
For Profiling feature, please refer to the wiki [Profiling](https://github.com/baidu/sofa-pbrpc/wiki/Profiling%E5%8A%9F%E8%83%BD).
56+
5457
### Performance
5558
For performace details, please refer to the wiki [Performance](https://github.com/baidu/sofa-pbrpc/wiki/%E6%80%A7%E8%83%BD).
5659

‎src/sofa/pbrpc/binary_rpc_request.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ void BinaryRpcRequest::ProcessRequest(
8585
}
8686
else
8787
{
88-
sofa::pbrpc::boost::scoped_ptr<AbstractCompressedInputStream> is(
88+
sofa::pbrpc::scoped_ptr<AbstractCompressedInputStream> is(
8989
get_compressed_input_stream(_req_body.get(), compress_type));
9090
parse_request_return = request->ParseFromZeroCopyStream(is.get());
9191
}
@@ -157,7 +157,7 @@ ReadBufferPtr BinaryRpcRequest::AssembleSucceedResponse(
157157
}
158158
else
159159
{
160-
sofa::pbrpc::boost::scoped_ptr<AbstractCompressedOutputStream> os(
160+
sofa::pbrpc::scoped_ptr<AbstractCompressedOutputStream> os(
161161
get_compressed_output_stream(&write_buffer, meta.compress_type()));
162162
ser_ret = response->SerializeToZeroCopyStream(os.get());
163163
os->Flush();

‎src/sofa/pbrpc/binary_rpc_request.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace pbrpc {
1515
class BinaryRpcRequestParser;
1616

1717
class BinaryRpcRequest;
18-
typedef sofa::pbrpc::boost::shared_ptr<BinaryRpcRequest> BinaryRpcRequestPtr;
18+
typedef sofa::pbrpc::shared_ptr<BinaryRpcRequest> BinaryRpcRequestPtr;
1919

2020
class BinaryRpcRequest : public RpcRequest
2121
{

‎src/sofa/pbrpc/buffer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ namespace pbrpc {
1818

1919
// Defined in this file.
2020
class ReadBuffer;
21-
typedef sofa::pbrpc::boost::shared_ptr<ReadBuffer> ReadBufferPtr;
21+
typedef sofa::pbrpc::shared_ptr<ReadBuffer> ReadBufferPtr;
2222
class WriteBuffer;
23-
typedef sofa::pbrpc::boost::shared_ptr<WriteBuffer> WriteBufferPtr;
23+
typedef sofa::pbrpc::shared_ptr<WriteBuffer> WriteBufferPtr;
2424

2525
typedef std::deque<BufHandle> BufHandleList;
2626
typedef std::deque<BufHandle>::iterator BufHandleListIterator;

‎src/sofa/pbrpc/closure.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
// 3, Support pass argument by reference, though bind
2121
// always by value.
2222
// 4, When bind class method, support use
23-
// "sofa::pbrpc::boost::shared_ptr" as this pointer of class.
23+
// "sofa::pbrpc::shared_ptr" as this pointer of class.
2424
// 5, Support create temporary and permanent closure:
2525
// Temporary closure (self destoryed after call):
2626
// NewClosure();
@@ -47,7 +47,7 @@
4747
// Closure* c3 = NewClosure(&obj, &ClassA::m1, 1, 2.0);
4848
// c3->Run();
4949
//
50-
// class ClassB : public sofa::pbrpc::boost::enable_shared_from_this<ClassB>
50+
// class ClassB : public sofa::pbrpc::enable_shared_from_this<ClassB>
5151
// {
5252
// public:
5353
// int m1(int pre_arg, double post_arg);
@@ -58,7 +58,7 @@
5858
// c4->Run(2.0);
5959
// }
6060
// };
61-
// sofa::pbrpc::boost::shared_ptr<ClassB> ptr(new ClassB);
61+
// sofa::pbrpc::shared_ptr<ClassB> ptr(new ClassB);
6262
// Closure* c5 = NewClosure(ptr, &ClassB::m1, 1, 2.0);
6363
// c5->Run();
6464
//

‎src/sofa/pbrpc/closure_gen.pl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ()
3131
print "// 3, Support pass argument by reference, though bind\n";
3232
print "// always by value.\n";
3333
print "// 4, When bind class method, support use\n";
34-
print "// \"sofa::pbrpc::boost::shared_ptr\" as this pointer of class.\n";
34+
print "// \"sofa::pbrpc::shared_ptr\" as this pointer of class.\n";
3535
print "// 5, Support create temporary and permanent closure:\n";
3636
print "// Temporary closure (self destoryed after call):\n";
3737
print "// NewClosure();\n";
@@ -58,7 +58,7 @@ ()
5858
print "// Closure* c3 = NewClosure(&obj, &ClassA::m1, 1, 2.0);\n";
5959
print "// c3->Run();\n";
6060
print "// \n";
61-
print "// class ClassB : public sofa::pbrpc::boost::enable_shared_from_this<ClassB>\n";
61+
print "// class ClassB : public sofa::pbrpc::enable_shared_from_this<ClassB>\n";
6262
print "// {\n";
6363
print "// public:\n";
6464
print "// int m1(int pre_arg, double post_arg);\n";
@@ -69,7 +69,7 @@ ()
6969
print "// c4->Run(2.0);\n";
7070
print "// }\n";
7171
print "// };\n";
72-
print "// sofa::pbrpc::boost::shared_ptr<ClassB> ptr(new ClassB);\n";
72+
print "// sofa::pbrpc::shared_ptr<ClassB> ptr(new ClassB);\n";
7373
print "// Closure* c5 = NewClosure(ptr, &ClassB::m1, 1, 2.0);\n";
7474
print "// c5->Run();\n";
7575
print "// \n";

‎src/sofa/pbrpc/common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <stdarg.h>
99
#include <google/protobuf/stubs/common.h>
1010

11-
#include <sofa/pbrpc/boost/smart_ptr.hpp>
11+
#include <sofa/pbrpc/smart_ptr/smart_ptr.hpp>
1212

1313
namespace std {}
1414

‎src/sofa/pbrpc/common_internal.h

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,54 +20,54 @@ namespace sofa {
2020
namespace pbrpc {
2121

2222
class RpcControllerImpl;
23-
typedef sofa::pbrpc::boost::shared_ptr<RpcControllerImpl> RpcControllerImplPtr;
24-
typedef sofa::pbrpc::boost::weak_ptr<RpcControllerImpl> RpcControllerImplWPtr;
23+
typedef sofa::pbrpc::shared_ptr<RpcControllerImpl> RpcControllerImplPtr;
24+
typedef sofa::pbrpc::weak_ptr<RpcControllerImpl> RpcControllerImplWPtr;
2525

2626
class RpcChannelImpl;
27-
typedef sofa::pbrpc::boost::shared_ptr<RpcChannelImpl> RpcChannelImplPtr;
27+
typedef sofa::pbrpc::shared_ptr<RpcChannelImpl> RpcChannelImplPtr;
2828

2929
class RpcClientImpl;
30-
typedef sofa::pbrpc::boost::shared_ptr<RpcClientImpl> RpcClientImplPtr;
30+
typedef sofa::pbrpc::shared_ptr<RpcClientImpl> RpcClientImplPtr;
3131

3232
class RpcServerImpl;
33-
typedef sofa::pbrpc::boost::shared_ptr<RpcServerImpl> RpcServerImplPtr;
34-
typedef sofa::pbrpc::boost::weak_ptr<RpcServerImpl> RpcServerImplWPtr;
33+
typedef sofa::pbrpc::shared_ptr<RpcServerImpl> RpcServerImplPtr;
34+
typedef sofa::pbrpc::weak_ptr<RpcServerImpl> RpcServerImplWPtr;
3535

3636
class RpcClientStream;
37-
typedef sofa::pbrpc::boost::shared_ptr<RpcClientStream> RpcClientStreamPtr;
38-
typedef sofa::pbrpc::boost::weak_ptr<RpcClientStream> RpcClientStreamWPtr;
37+
typedef sofa::pbrpc::shared_ptr<RpcClientStream> RpcClientStreamPtr;
38+
typedef sofa::pbrpc::weak_ptr<RpcClientStream> RpcClientStreamWPtr;
3939

4040
class RpcServerStream;
41-
typedef sofa::pbrpc::boost::shared_ptr<RpcServerStream> RpcServerStreamPtr;
42-
typedef sofa::pbrpc::boost::weak_ptr<RpcServerStream> RpcServerStreamWPtr;
41+
typedef sofa::pbrpc::shared_ptr<RpcServerStream> RpcServerStreamPtr;
42+
typedef sofa::pbrpc::weak_ptr<RpcServerStream> RpcServerStreamWPtr;
4343

4444
class RpcListener;
45-
typedef sofa::pbrpc::boost::shared_ptr<RpcListener> RpcListenerPtr;
45+
typedef sofa::pbrpc::shared_ptr<RpcListener> RpcListenerPtr;
4646

4747
class TimerWorker;
48-
typedef sofa::pbrpc::boost::shared_ptr<TimerWorker> TimerWorkerPtr;
48+
typedef sofa::pbrpc::shared_ptr<TimerWorker> TimerWorkerPtr;
4949

5050
class RpcTimeoutManager;
51-
typedef sofa::pbrpc::boost::shared_ptr<RpcTimeoutManager> RpcTimeoutManagerPtr;
51+
typedef sofa::pbrpc::shared_ptr<RpcTimeoutManager> RpcTimeoutManagerPtr;
5252

5353
class ThreadGroup;
54-
typedef sofa::pbrpc::boost::shared_ptr<ThreadGroup> ThreadGroupPtr;
54+
typedef sofa::pbrpc::shared_ptr<ThreadGroup> ThreadGroupPtr;
5555

5656
class ServicePool;
57-
typedef sofa::pbrpc::boost::shared_ptr<ServicePool> ServicePoolPtr;
58-
typedef sofa::pbrpc::boost::weak_ptr<ServicePool> ServicePoolWPtr;
57+
typedef sofa::pbrpc::shared_ptr<ServicePool> ServicePoolPtr;
58+
typedef sofa::pbrpc::weak_ptr<ServicePool> ServicePoolWPtr;
5959

6060
class FlowController;
61-
typedef sofa::pbrpc::boost::shared_ptr<FlowController> FlowControllerPtr;
61+
typedef sofa::pbrpc::shared_ptr<FlowController> FlowControllerPtr;
6262

6363
class WaitEvent;
64-
typedef sofa::pbrpc::boost::shared_ptr<WaitEvent> WaitEventPtr;
64+
typedef sofa::pbrpc::shared_ptr<WaitEvent> WaitEventPtr;
6565

6666
class IOServicePool;
67-
typedef sofa::pbrpc::boost::shared_ptr<IOServicePool> IOServicePoolPtr;
67+
typedef sofa::pbrpc::shared_ptr<IOServicePool> IOServicePoolPtr;
6868

6969
class WebService;
70-
typedef sofa::pbrpc::boost::shared_ptr<WebService> WebServicePtr;
70+
typedef sofa::pbrpc::shared_ptr<WebService> WebServicePtr;
7171

7272
#define SOFA_PBRPC_DECLARE_RESOURCE_COUNTER(name_) \
7373
extern sofa::pbrpc::AtomicCounter g_sofa_counter_##name_

‎src/sofa/pbrpc/dynamic_rpc_channel_impl.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,24 @@ namespace pbrpc {
1111
class EventHandlerImp : public RpcChannel::EventHandler
1212
{
1313
public:
14-
EventHandlerImp(::sofa::pbrpc::boost::weak_ptr<DynamicRpcChannelImpl> channel) : _channel(channel) {}
14+
EventHandlerImp(::sofa::pbrpc::weak_ptr<DynamicRpcChannelImpl> channel) : _channel(channel) {}
1515
virtual ~EventHandlerImp() {}
1616
virtual void OnAddressAdded(const std::vector<std::string>& address_list)
1717
{
18-
::sofa::pbrpc::boost::shared_ptr<DynamicRpcChannelImpl> channel = _channel.lock();
18+
::sofa::pbrpc::shared_ptr<DynamicRpcChannelImpl> channel = _channel.lock();
1919
if (channel) {
2020
channel->OnAddressAdded(address_list);
2121
}
2222
}
2323
virtual void OnAddressRemoved(const std::vector<std::string>& address_list)
2424
{
25-
::sofa::pbrpc::boost::shared_ptr<DynamicRpcChannelImpl> channel = _channel.lock();
25+
::sofa::pbrpc::shared_ptr<DynamicRpcChannelImpl> channel = _channel.lock();
2626
if (channel) {
2727
channel->OnAddressRemoved(address_list);
2828
}
2929
}
3030
private:
31-
::sofa::pbrpc::boost::weak_ptr<DynamicRpcChannelImpl> _channel;
31+
::sofa::pbrpc::weak_ptr<DynamicRpcChannelImpl> _channel;
3232
};
3333

3434
DynamicRpcChannelImpl::DynamicRpcChannelImpl(

‎src/sofa/pbrpc/dynamic_rpc_channel_impl.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
#include <sofa/pbrpc/timeout_manager.h>
1717
#include <sofa/pbrpc/counter.h>
1818
#include <sofa/pbrpc/builtin_service.pb.h>
19-
#include <sofa/pbrpc/boost/enable_shared_from_this.hpp>
19+
#include <sofa/pbrpc/smart_ptr/enable_shared_from_this.hpp>
2020

2121
namespace sofa {
2222
namespace pbrpc {
2323

2424
class DynamicRpcChannelImpl : public RpcChannelImpl,
25-
public ::sofa::pbrpc::boost::enable_shared_from_this<DynamicRpcChannelImpl>
25+
public ::sofa::pbrpc::enable_shared_from_this<DynamicRpcChannelImpl>
2626
{
2727
public:
2828
// Detect timeout, 3 second.
@@ -46,18 +46,18 @@ class DynamicRpcChannelImpl : public RpcChannelImpl,
4646
volatile bool is_removed; // if this address is already removed.
4747
volatile bool is_channel_inited; // if the channel is already inited.
4848
LockType channel_init_lock;
49-
::sofa::pbrpc::boost::shared_ptr<SimpleRpcChannelImpl> channel;
49+
::sofa::pbrpc::shared_ptr<SimpleRpcChannelImpl> channel;
5050
volatile bool is_builtin_service_inited; // if the builtin service is already inited.
5151
LockType builtin_service_init_lock;
52-
::sofa::pbrpc::boost::scoped_ptr<builtin::BuiltinService_Stub> builtin_service;
52+
::sofa::pbrpc::scoped_ptr<builtin::BuiltinService_Stub> builtin_service;
5353
uint64 last_request_seq; // the last request sequence number sent by this channel.
5454

5555
ServerContext(const std::string& server_address_);
5656
~ServerContext();
5757
bool InitChannel(const RpcClientImplPtr& client_impl, const RpcChannelOptions& options);
5858
bool InitBuiltinService(const RpcChannelOptions& options);
5959
};
60-
typedef ::sofa::pbrpc::boost::shared_ptr<ServerContext> ServerContextPtr;
60+
typedef ::sofa::pbrpc::shared_ptr<ServerContext> ServerContextPtr;
6161
typedef std::map<std::string, ServerContextPtr> ServerContextMap;
6262

6363
struct AddResult {

‎src/sofa/pbrpc/ext_closure.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// 2, Support pass argument by reference, though bind
1515
// always by value.
1616
// 3, When bind class method, support use
17-
// "sofa::pbrpc::boost::shared_ptr" as this pointer of class.
17+
// "sofa::pbrpc::shared_ptr" as this pointer of class.
1818
// 4, Support create temporary and permanent closure:
1919
// Temporary closure (self destoryed after call):
2020
// NewExtClosure();
@@ -50,7 +50,7 @@
5050
// ExtClosure<int(double)>* c4 = NewPermanentExtClosure(&obj, &C1::m1, 1);
5151
// c4->Run(2.0);
5252
//
53-
// class C2 : public sofa::pbrpc::boost::enable_shared_from_this<C2>
53+
// class C2 : public sofa::pbrpc::enable_shared_from_this<C2>
5454
// {
5555
// public:
5656
// int m1(int pre_arg, double post_arg);

‎src/sofa/pbrpc/ext_closure_gen.pl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ()
2626
print "// 2, Support pass argument by reference, though bind\n";
2727
print "// always by value.\n";
2828
print "// 3, When bind class method, support use\n";
29-
print "// \"sofa::pbrpc::boost::shared_ptr\" as this pointer of class.\n";
29+
print "// \"sofa::pbrpc::shared_ptr\" as this pointer of class.\n";
3030
print "// 4, Support create temporary and permanent closure:\n";
3131
print "// Temporary closure (self destoryed after call):\n";
3232
print "// NewExtClosure();\n";
@@ -62,7 +62,7 @@ ()
6262
print "// ExtClosure<int(double)>* c4 = NewPermanentExtClosure(&obj, &C1::m1, 1);\n";
6363
print "// c4->Run(2.0);\n";
6464
print "// \n";
65-
print "// class C2 : public sofa::pbrpc::boost::enable_shared_from_this<C2>\n";
65+
print "// class C2 : public sofa::pbrpc::enable_shared_from_this<C2>\n";
6666
print "// {\n";
6767
print "// public:\n";
6868
print "// int m1(int pre_arg, double post_arg);\n";

‎src/sofa/pbrpc/http-agent/http_agent.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class HttpAgent
5454
::google::protobuf::Closure* done);
5555

5656
private:
57-
static void CallMethodDone(const sofa::pbrpc::boost::shared_ptr<RpcControllerImpl>& cntl,
57+
static void CallMethodDone(const sofa::pbrpc::shared_ptr<RpcControllerImpl>& cntl,
5858
std::string* response,
5959
::google::protobuf::Message* request_message,
6060
::google::protobuf::Message* response_message,

‎src/sofa/pbrpc/http_rpc_request.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace pbrpc {
1717
class HTTPRpcRequestParser;
1818

1919
class HTTPRpcRequest;
20-
typedef sofa::pbrpc::boost::shared_ptr<HTTPRpcRequest> HTTPRpcRequestPtr;
20+
typedef sofa::pbrpc::shared_ptr<HTTPRpcRequest> HTTPRpcRequestPtr;
2121

2222
struct HTTPResponse;
2323

‎src/sofa/pbrpc/io_service.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,16 @@ namespace sofa {
4646
namespace pbrpc {
4747

4848
typedef sofa::pbrpc::boost::asio::io_service IOService;
49-
typedef sofa::pbrpc::boost::shared_ptr<IOService> IOServicePtr;
49+
typedef sofa::pbrpc::shared_ptr<IOService> IOServicePtr;
5050

5151
typedef sofa::pbrpc::boost::asio::io_service::work IOServiceWork;
52-
typedef sofa::pbrpc::boost::shared_ptr<IOServiceWork> IOServiceWorkPtr;
52+
typedef sofa::pbrpc::shared_ptr<IOServiceWork> IOServiceWorkPtr;
5353

5454
typedef sofa::pbrpc::boost::asio::io_service::strand IOServiceStrand;
55-
typedef sofa::pbrpc::boost::shared_ptr<IOServiceStrand> IOServiceStrandPtr;
55+
typedef sofa::pbrpc::shared_ptr<IOServiceStrand> IOServiceStrandPtr;
5656

5757
typedef sofa::pbrpc::boost::asio::deadline_timer IOServiceTimer;
58-
typedef sofa::pbrpc::boost::shared_ptr<IOServiceTimer> IOServiceTimerPtr;
58+
typedef sofa::pbrpc::shared_ptr<IOServiceTimer> IOServiceTimerPtr;
5959

6060
} // namespace pbrpc
6161
} // namespace sofa

‎src/sofa/pbrpc/rpc_byte_stream.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace pbrpc {
3535
using sofa::pbrpc::boost::asio::ip::tcp;
3636
using namespace sofa::pbrpc::boost::asio;
3737

38-
class RpcByteStream : public sofa::pbrpc::boost::enable_shared_from_this<RpcByteStream>
38+
class RpcByteStream : public sofa::pbrpc::enable_shared_from_this<RpcByteStream>
3939
{
4040
public:
4141
RpcByteStream(IOService& io_service, const RpcEndpoint& endpoint)

‎src/sofa/pbrpc/rpc_channel.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,13 @@ class RpcChannel : public google::protobuf::RpcChannel
106106
::google::protobuf::Closure* done);
107107

108108
public:
109-
const sofa::pbrpc::boost::shared_ptr<RpcChannelImpl>& impl() const
109+
const sofa::pbrpc::shared_ptr<RpcChannelImpl>& impl() const
110110
{
111111
return _impl;
112112
}
113113

114114
private:
115-
sofa::pbrpc::boost::shared_ptr<RpcChannelImpl> _impl;
115+
sofa::pbrpc::shared_ptr<RpcChannelImpl> _impl;
116116

117117
SOFA_PBRPC_DISALLOW_EVIL_CONSTRUCTORS(RpcChannel);
118118
}; // class RpcChannel

‎src/sofa/pbrpc/rpc_client.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,13 @@ class RpcClient
8484
void Shutdown();
8585

8686
public:
87-
const sofa::pbrpc::boost::shared_ptr<RpcClientImpl>& impl() const
87+
const sofa::pbrpc::shared_ptr<RpcClientImpl>& impl() const
8888
{
8989
return _impl;
9090
}
9191

9292
private:
93-
sofa::pbrpc::boost::shared_ptr<RpcClientImpl> _impl;
93+
sofa::pbrpc::shared_ptr<RpcClientImpl> _impl;
9494

9595
SOFA_PBRPC_DISALLOW_EVIL_CONSTRUCTORS(RpcClient);
9696
}; // class RpcClient

0 commit comments

Comments
 (0)