diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-04-27 19:14:45 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-04-27 19:14:45 -0400 |
| commit | fab9d11db1fef861c422711b20b48dc9bd83c5d7 (patch) | |
| tree | 42e37de8da645947adafb5144bac59ac31a0a2d3 /cpp/src/Glacier2Lib/SessionHelper.cpp | |
| parent | Fix for OpenSSL IceSSL/configuration test on Windows (diff) | |
| download | ice-fab9d11db1fef861c422711b20b48dc9bd83c5d7.tar.bz2 ice-fab9d11db1fef861c422711b20b48dc9bd83c5d7.tar.xz ice-fab9d11db1fef861c422711b20b48dc9bd83c5d7.zip | |
SessionHelper API cleanup
Diffstat (limited to 'cpp/src/Glacier2Lib/SessionHelper.cpp')
| -rw-r--r-- | cpp/src/Glacier2Lib/SessionHelper.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cpp/src/Glacier2Lib/SessionHelper.cpp b/cpp/src/Glacier2Lib/SessionHelper.cpp index 217dcbc36b8..6cb7787cc8a 100644 --- a/cpp/src/Glacier2Lib/SessionHelper.cpp +++ b/cpp/src/Glacier2Lib/SessionHelper.cpp @@ -41,7 +41,7 @@ public: private: - const Glacier2::SessionFactoryHelperPtr _factory; + const SessionFactoryHelperPtr _factory; }; ICE_DEFINE_PTR(SessionThreadCallbackPtr, SessionThreadCallback); @@ -313,6 +313,8 @@ Glacier2::SessionHelper::~SessionHelper() // Out of line to avoid weak vtable } + +#ifndef ICE_CPP11_MAPPING bool Glacier2::SessionHelper::operator==(const Glacier2::SessionHelper& other) const { @@ -324,6 +326,7 @@ Glacier2::SessionHelper::operator!=(const Glacier2::SessionHelper& other) const { return this != &other; } +#endif Ice::ObjectAdapterPtr SessionHelperI::internalObjectAdapter() @@ -1093,7 +1096,7 @@ Glacier2::SessionFactoryHelper::getInitializationData() const } void -Glacier2::SessionFactoryHelper::setConnectContext(map<string, string> context) +Glacier2::SessionFactoryHelper::setConnectContext(const map<string, string>& context) { IceUtil::Mutex::Lock sync(_mutex); _context = context; |