diff options
| author | Jose <jose@zeroc.com> | 2016-01-07 22:10:59 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-01-07 22:10:59 +0100 |
| commit | 290491fa71adff5f79a886ae76333ab6cd4b30b1 (patch) | |
| tree | 2451683ba138e29f70c1dbd2a2989c145429dd99 /cpp/include/Ice/BasicStream.h | |
| parent | ICE-6921 - GC visit members fix for Ice::Value (diff) | |
| download | ice-290491fa71adff5f79a886ae76333ab6cd4b30b1.tar.bz2 ice-290491fa71adff5f79a886ae76333ab6cd4b30b1.tar.xz ice-290491fa71adff5f79a886ae76333ab6cd4b30b1.zip | |
ICE-6910 - C++11 remove public cto for proxy classes
Diffstat (limited to 'cpp/include/Ice/BasicStream.h')
| -rw-r--r-- | cpp/include/Ice/BasicStream.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/include/Ice/BasicStream.h b/cpp/include/Ice/BasicStream.h index 9c7adf8e3bd..bf77c57d532 100644 --- a/cpp/include/Ice/BasicStream.h +++ b/cpp/include/Ice/BasicStream.h @@ -806,7 +806,7 @@ public: writeProxy(::std::static_pointer_cast<::Ice::ObjectPrx>(v)); } - ::Ice::ObjectPrxPtr readProxy(); + ::std::shared_ptr<::Ice::ObjectPrx> readProxy(); template<typename T, typename ::std::enable_if<::std::is_base_of<::Ice::ObjectPrx, T>::value>::type* = nullptr> void read(::std::shared_ptr<T>& v) @@ -818,7 +818,7 @@ public: } else { - v = ::std::make_shared<T>(); + v = ::IceInternal::createProxy<T>(); v->__copyFrom(proxy); } } |