changed some references to pointers

ersintarhan · Jun 5, 2010 · 8296cac · 8296cac
1 parent 179b32c
commit 8296cac
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 38 deletions.
diff --git a/Cpp/ProtoBufRemote/Generators.h b/Cpp/ProtoBufRemote/Generators.h
@@ -28,7 +28,7 @@
 	class name##Proxy : public ::ProtoBufRemote::Proxy \
 	{ \
 	public: \
-		name##Proxy(::ProtoBufRemote::RpcClient& client) : ::ProtoBufRemote::Proxy(client, #name) { } \
+		name##Proxy(::ProtoBufRemote::RpcClient* client) : ::ProtoBufRemote::Proxy(client, #name) { } \
 		BOOST_PP_SEQ_FOR_EACH(PBR_X_PROXY_METHOD, ~, methods) \
 	};
 
@@ -121,21 +121,21 @@
 	m_parameters.Add().PBR_X_PARAM_SET_FUNC(param) (BOOST_PP_CAT(p, i)); \
 
 #define PBR_X_METHOD_CALL(method) \
-	::ProtoBufRemote::PendingCall* call = m_client.Call(m_serviceName, BOOST_PP_STRINGIZE(PBR_X_METHOD_NAME(method)), \
+	::ProtoBufRemote::PendingCall* call = m_client->Call(m_serviceName, BOOST_PP_STRINGIZE(PBR_X_METHOD_NAME(method)), \
 		m_parameters); \
 	call->Wait(); \
 	BOOST_PP_IF(PBR_X_PARAM_IS_RESULT_PTR(PBR_X_METHOD_RETURN(method)), \
 		call->GetResult()->PBR_X_PARAM_GET_FUNC(PBR_X_METHOD_RETURN(method))(resultPtr); \
-		m_client.ReleaseCall(call); \
+		m_client->ReleaseCall(call); \
 	, \
 		PBR_X_PARAM_TYPE(PBR_X_METHOD_RETURN(method)) result \
 			= call->GetResult()->PBR_X_PARAM_GET_FUNC(PBR_X_METHOD_RETURN(method))(); \
-		m_client.ReleaseCall(call); \
+		m_client->ReleaseCall(call); \
 		return result; \
 	)
 
 #define PBR_X_METHOD_CALLWITHOUTRESULT(method) \
-	m_client.CallWithoutResult(m_serviceName, BOOST_PP_STRINGIZE(PBR_X_METHOD_NAME(method)), m_parameters);
+	m_client->CallWithoutResult(m_serviceName, BOOST_PP_STRINGIZE(PBR_X_METHOD_NAME(method)), m_parameters);
 
 
 //stub

diff --git a/Cpp/ProtoBufRemote/MutableParameterList.cpp b/Cpp/ProtoBufRemote/MutableParameterList.cpp
@@ -4,19 +4,19 @@
 
 namespace ProtoBufRemote {
 
-MutableParameterList::MutableParameterList(RpcMessage& message)
-	: ParameterList(message), m_message(message)
+MutableParameterList::MutableParameterList(RpcMessage* message)
+	: ParameterList(*message), m_message(message)
 {
 }
 
 void MutableParameterList::Clear()
 {
-	m_message.mutable_call_message()->clear_parameters();
+	m_message->mutable_call_message()->clear_parameters();
 }
 
 MutableParameter MutableParameterList::Add()
 {
-	RpcMessage::Parameter* paramMessage = m_message.mutable_call_message()->add_parameters();
+	RpcMessage::Parameter* paramMessage = m_message->mutable_call_message()->add_parameters();
 	return MutableParameter(paramMessage);
 }
 

diff --git a/Cpp/ProtoBufRemote/MutableParameterList.h b/Cpp/ProtoBufRemote/MutableParameterList.h
@@ -8,14 +8,14 @@ namespace ProtoBufRemote {
 class MutableParameterList : public ParameterList
 {
 public:
-	MutableParameterList(RpcMessage& message);
+	MutableParameterList(RpcMessage* message);
 
 	void Clear();
 
 	MutableParameter Add();
 
 private:
-	RpcMessage& m_message;
+	RpcMessage* m_message;
 };
 
 }

diff --git a/Cpp/ProtoBufRemote/ParameterList.h b/Cpp/ProtoBufRemote/ParameterList.h
@@ -20,7 +20,7 @@ class ParameterList
 private:
 	friend RpcClient;
 
-	RpcMessage& GetMessage() const { return const_cast<RpcMessage&>(m_message); }
+	RpcMessage* GetMessage() const { return const_cast<RpcMessage*>(&m_message); }
 
 	const RpcMessage& m_message;
 };

diff --git a/Cpp/ProtoBufRemote/Proxy.h b/Cpp/ProtoBufRemote/Proxy.h
@@ -11,13 +11,13 @@ class RpcClient;
 class Proxy
 {
 public:
-	Proxy(RpcClient& client, const char* serviceName)
-		: m_client(client), m_serviceName(serviceName), m_parameters(m_message)
+	Proxy(RpcClient* client, const char* serviceName)
+		: m_client(client), m_serviceName(serviceName), m_parameters(&m_message)
 	{
 	}
 
 protected:
-	RpcClient& m_client;
+	RpcClient* m_client;
 	std::string m_serviceName;
 	RpcMessage m_message;
 	MutableParameterList m_parameters;

diff --git a/Cpp/ProtoBufRemote/RpcClient.cpp b/Cpp/ProtoBufRemote/RpcClient.cpp
@@ -19,18 +19,18 @@ PendingCall* RpcClient::Call(const std::string& service, const std::string& meth
 {
 	assert(m_controller);
 
-	RpcMessage& message = parameters.GetMessage();
+	RpcMessage* message = parameters.GetMessage();
 	int id = m_nextId++;
-	message.set_id(id);
-	RpcMessage::Call* callMessage = message.mutable_call_message();
+	message->set_id(id);
+	RpcMessage::Call* callMessage = message->mutable_call_message();
 	callMessage->set_service(service);
 	callMessage->set_method(method);
 	callMessage->set_expects_result(true);
 
 	PendingCall* call = new PendingCall(id);
 	m_pendingCalls.insert(std::make_pair(id, call));
 
-	m_controller->Send(message);
+	m_controller->Send(*message);
 
 	return call;
 }
@@ -46,13 +46,13 @@ void RpcClient::CallWithoutResult(const std::string& service, const std::string&
 {
 	assert(m_controller);
 
-	RpcMessage& message = parameters.GetMessage();
-	message.set_id(m_nextId++);
-	RpcMessage::Call* callMessage = message.mutable_call_message();
+	RpcMessage* message = parameters.GetMessage();
+	message->set_id(m_nextId++);
+	RpcMessage::Call* callMessage = message->mutable_call_message();
 	callMessage->set_service(service);
 	callMessage->set_method(method);
 	callMessage->set_expects_result(false);
-	m_controller->Send(message);
+	m_controller->Send(*message);
 }
 
 void RpcClient::ReceiveResult(const RpcMessage& resultMessage)

diff --git a/Cpp/ProtoBufRemoteTest/ProxyGeneratorTest.cpp b/Cpp/ProtoBufRemoteTest/ProxyGeneratorTest.cpp
@@ -33,7 +33,7 @@ bool IsDoStuffParameterListCorrect(const ParameterList& paramList)
 TEST(ProxyGeneratorTest, Call)
 {
 	MockRpcClient client;
-	SampleService2Proxy proxy(client);
+	SampleService2Proxy proxy(&client);
 
 	PendingCall call(0);
 	RpcMessage::Parameter resultParam;
@@ -51,7 +51,7 @@ TEST(ProxyGeneratorTest, Call)
 TEST(ProxyGeneratorTest, CallWithoutResult)
 {
 	MockRpcClient client;
-	SampleService2Proxy proxy(client);
+	SampleService2Proxy proxy(&client);
 
 	EXPECT_CALL(client, CallWithoutResult("SampleService2", "DoStuff", Truly(IsDoStuffParameterListCorrect)));
 

diff --git a/Cpp/ProtoBufRemoteTest/ProxyTest.cpp b/Cpp/ProtoBufRemoteTest/ProxyTest.cpp
@@ -28,7 +28,7 @@ bool IsDoStuffParameterListCorrect(const ParameterList& paramList)
 TEST(ProxyTest, Call)
 {
 	MockRpcClient client;
-	SampleServiceProxy proxy(client);
+	SampleServiceProxy proxy(&client);
 
 	PendingCall call(0);
 	RpcMessage::Parameter resultParam;
@@ -46,7 +46,7 @@ TEST(ProxyTest, Call)
 TEST(ProxyTest, CallWithoutResult)
 {
 	MockRpcClient client;
-	SampleServiceProxy proxy(client);
+	SampleServiceProxy proxy(&client);
 
 	EXPECT_CALL(client, CallWithoutResult("SampleService", "DoStuff", Truly(IsDoStuffParameterListCorrect)));
 

diff --git a/Cpp/ProtoBufRemoteTest/RpcClientTest.cpp b/Cpp/ProtoBufRemoteTest/RpcClientTest.cpp
@@ -68,7 +68,7 @@ TEST_F(RpcClientTest, CallWithoutResult)
 		Property(&RpcMessage::call_message, Property(&RpcMessage::Call::expects_result, Eq(false))))));
 
 	RpcMessage message;
-	MutableParameterList parameters(message);
+	MutableParameterList parameters(&message);
 	parameters.Add().SetInt(42);
 	m_client->CallWithoutResult("ServiceName", "MethodName", parameters);
 }
@@ -80,7 +80,7 @@ TEST_F(RpcClientTest, Call)
 		.WillOnce(Invoke(this, &RpcClientTest::SendResult));
 
 	RpcMessage message;
-	MutableParameterList parameters(message);
+	MutableParameterList parameters(&message);
 	parameters.Add().SetInt(42);
 	PendingCall* call = m_client->Call("ServiceName", "MethodName", parameters);
 	call->Wait();

diff --git a/Cpp/ProtoBufRemoteTest/SampleServiceProxy.h b/Cpp/ProtoBufRemoteTest/SampleServiceProxy.h
@@ -7,7 +7,7 @@
 class SampleServiceProxy : public ProtoBufRemote::Proxy
 {
 public:
-	SampleServiceProxy(ProtoBufRemote::RpcClient& client)
+	SampleServiceProxy(ProtoBufRemote::RpcClient* client)
 		: ProtoBufRemote::Proxy(client, "SampleService")
 	{
 	}
@@ -16,18 +16,18 @@ class SampleServiceProxy : public ProtoBufRemote::Proxy
 	{
 		m_parameters.Clear();
 		m_parameters.Add().SetInt(x);
-		ProtoBufRemote::PendingCall* call = m_client.Call(m_serviceName, "GetSquare", m_parameters);
+		ProtoBufRemote::PendingCall* call = m_client->Call(m_serviceName, "GetSquare", m_parameters);
 		call->Wait();
 		int result = call->GetResult()->GetInt();
-		m_client.ReleaseCall(call);
+		m_client->ReleaseCall(call);
 		return result;
 	}
 
 	void DoStuff(const std::string& str)
 	{
 		m_parameters.Clear();
 		m_parameters.Add().SetString(str);
-		m_client.CallWithoutResult(m_serviceName, "DoStuff", m_parameters);
+		m_client->CallWithoutResult(m_serviceName, "DoStuff", m_parameters);
 	}
 };
 

diff --git a/Cpp/ProtoBufRemoteTest/StubGeneratorTest.cpp b/Cpp/ProtoBufRemoteTest/StubGeneratorTest.cpp
@@ -39,7 +39,7 @@ TEST(StubGeneratorTest, Call)
 	EXPECT_CALL(service, GetSquare(5)).WillOnce(Return(25));
 
 	RpcMessage message;
-	MutableParameterList parameters(message);
+	MutableParameterList parameters(&message);
 	parameters.Add().SetInt(5);
 	RpcMessage::Parameter resultMessage;
 	MutableParameter result(&resultMessage);
@@ -57,7 +57,7 @@ TEST(StubGeneratorTest, CallWithoutResult)
 	EXPECT_CALL(service, DoStuff("hello"));
 
 	RpcMessage message;
-	MutableParameterList parameters(message);
+	MutableParameterList parameters(&message);
 	parameters.Add().SetString("hello");
 
 	bool isSuccess = service.Call("DoStuff", parameters, NULL);
@@ -70,7 +70,7 @@ TEST(StubGeneratorTest, CallUnknownMethod)
 	MockSampleService2 service;
 
 	RpcMessage message;
-	MutableParameterList parameters(message);
+	MutableParameterList parameters(&message);
 
 	bool isSuccess = service.Call("NotAMethod", parameters, NULL);
 
@@ -82,7 +82,7 @@ TEST(StubGeneratorTest, CallWrongParameterCount)
 	MockSampleService2 service;
 
 	RpcMessage message;
-	MutableParameterList parameters(message);
+	MutableParameterList parameters(&message);
 	parameters.Add().SetInt(5);
 	parameters.Add().SetInt(6);
 	RpcMessage::Parameter resultMessage;
@@ -98,7 +98,7 @@ TEST(StubGeneratorTest, CallWrongParameterType)
 	MockSampleService2 service;
 
 	RpcMessage message;
-	MutableParameterList parameters(message);
+	MutableParameterList parameters(&message);
 	parameters.Add().SetString("hello");
 	RpcMessage::Parameter resultMessage;
 	MutableParameter result(&resultMessage);