diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-02-03 10:42:29 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-02-03 10:42:29 +0100 |
| commit | 18a6720fcc3ece576f5fb26283e239cda2bebadd (patch) | |
| tree | a7d9de0acab9e092943fb182fa880b2c4b950db6 /cpp/include/Ice/InputStream.h | |
| parent | ICE-6861 - Java stream API changes (diff) | |
| download | ice-18a6720fcc3ece576f5fb26283e239cda2bebadd.tar.bz2 ice-18a6720fcc3ece576f5fb26283e239cda2bebadd.tar.xz ice-18a6720fcc3ece576f5fb26283e239cda2bebadd.zip | |
Refactored invocation code to better suite new C++11 mapping
Diffstat (limited to 'cpp/include/Ice/InputStream.h')
| -rw-r--r-- | cpp/include/Ice/InputStream.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cpp/include/Ice/InputStream.h b/cpp/include/Ice/InputStream.h index 0e1aea08587..b903f955b82 100644 --- a/cpp/include/Ice/InputStream.h +++ b/cpp/include/Ice/InputStream.h @@ -24,7 +24,6 @@ #include <Ice/UserExceptionFactory.h> #include <Ice/StreamHelpers.h> #include <Ice/FactoryTable.h> -#include <Ice/Traits.h> namespace Ice { @@ -362,13 +361,13 @@ public: template<typename T> void read(Int tag, IceUtil::Optional<T>& v) { if(readOpt(tag, StreamOptionalHelper<T, - StreamableTraits<T>::helper, - StreamableTraits<T>::fixedLength>::optionalFormat)) + StreamableTraits<T>::helper, + StreamableTraits<T>::fixedLength>::optionalFormat)) { v.__setIsSet(); StreamOptionalHelper<T, - StreamableTraits<T>::helper, - StreamableTraits<T>::fixedLength>::read(this, *v); + StreamableTraits<T>::helper, + StreamableTraits<T>::fixedLength>::read(this, *v); } else { |