diff options
| author | mad@chromium.org <mad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-18 21:00:29 +0000 |
|---|---|---|
| committer | mad@chromium.org <mad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-18 21:00:29 +0000 |
| commit | e959c60f8e872a7d29f42a3fa0051dcb0a95ef3a (patch) | |
| tree | c3f46ec289ed5d77b7f66975497f74f68f2e1814 | |
| parent | 794c0f3d2df1ada44f59c660f86d3a9a8fc2190c (diff) | |
| download | chromium_src-e959c60f8e872a7d29f42a3fa0051dcb0a95ef3a.zip chromium_src-e959c60f8e872a7d29f42a3fa0051dcb0a95ef3a.tar.gz chromium_src-e959c60f8e872a7d29f42a3fa0051dcb0a95ef3a.tar.bz2 | |
Fix a build break caused by a weird merge problem introduced in http://src.chromium.org/viewvc/chrome?view=rev&revision=71510.
BUG=69718
TEST=Just compile...
Review URL: http://codereview.chromium.org/6292005
git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71694 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ceee/ie/broker/broker_rpc_client.cc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/ceee/ie/broker/broker_rpc_client.cc b/ceee/ie/broker/broker_rpc_client.cc index 7f6c078..3a0c1b1 100644 --- a/ceee/ie/broker/broker_rpc_client.cc +++ b/ceee/ie/broker/broker_rpc_client.cc @@ -25,10 +25,6 @@ void LogRpcException(const char* str, unsigned int exception_code) { LOG(ERROR) << str << com::LogWe(exception_code); } -BrokerRpcClient::~BrokerRpcClient() { - Disconnect(); -} - int HandleRpcException(unsigned int rpc_exception_code) { switch (rpc_exception_code) { case STATUS_ACCESS_VIOLATION: @@ -45,8 +41,16 @@ int HandleRpcException(unsigned int rpc_exception_code) { return EXCEPTION_EXECUTE_HANDLER; } -static void LogRpcException(const char* str, unsigned int exception_code) { - LOG(ERROR) << str << com::LogWe(exception_code); +} // namespace + +BrokerRpcClient::BrokerRpcClient(bool allow_restarts) + : context_(0), + binding_handle_(NULL), + allow_restarts_(allow_restarts) { +} + +BrokerRpcClient::~BrokerRpcClient() { + Disconnect(); } void BrokerRpcClient::LockContext() { |