diff options
| author | Jose <jose@zeroc.com> | 2018-09-07 18:47:28 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2018-09-07 18:47:28 +0200 |
| commit | 8cddd264e57ab89fc4c6952b2b390457a4bfbedf (patch) | |
| tree | 66bb34aa13289ed0017a9460e800740516bb1278 /cpp/test/Ice/optional/TestI.cpp | |
| parent | Enable test workers for PHP, Ruby and Python (diff) | |
| download | ice-8cddd264e57ab89fc4c6952b2b390457a4bfbedf.tar.bz2 ice-8cddd264e57ab89fc4c6952b2b390457a4bfbedf.tar.xz ice-8cddd264e57ab89fc4c6952b2b390457a4bfbedf.zip | |
Fixes for C++17 mode
Close #180
Diffstat (limited to 'cpp/test/Ice/optional/TestI.cpp')
| -rw-r--r-- | cpp/test/Ice/optional/TestI.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/test/Ice/optional/TestI.cpp b/cpp/test/Ice/optional/TestI.cpp index a6953c1ec9d..1696df988f2 100644 --- a/cpp/test/Ice/optional/TestI.cpp +++ b/cpp/test/Ice/optional/TestI.cpp @@ -277,9 +277,9 @@ InitialI::opDoubleSeq(ICE_IN(Optional<pair<const Double*, const Double*> >) p1, } #ifdef ICE_CPP11_MAPPING -optional<Ice::StringSeq> -InitialI::opStringSeq(optional<Ice::StringSeq> p1, - optional<Ice::StringSeq>& p3, const Current&) +Ice::optional<Ice::StringSeq> +InitialI::opStringSeq(Ice::optional<Ice::StringSeq> p1, + Ice::optional<Ice::StringSeq>& p3, const Current&) { if(p1) { @@ -345,9 +345,9 @@ InitialI::opFixedStructList(ICE_IN(Optional<pair<const FixedStruct*, const Fixed } #ifdef ICE_CPP11_MAPPING -optional<VarStructSeq> -InitialI::opVarStructSeq(optional<VarStructSeq> p1, - optional<VarStructSeq>& p3, const Current&) +Ice::optional<VarStructSeq> +InitialI::opVarStructSeq(Ice::optional<VarStructSeq> p1, + Ice::optional<VarStructSeq>& p3, const Current&) { if(p1) { |