diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2018-04-14 14:09:59 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2018-04-14 15:58:15 +0100 |
| commit | ce87f52fa9976b2d9633be9c25ef4321c56eb2e6 (patch) | |
| tree | feba0ab409504d4cda2a5db566bfab2b09c2461e /slicer/test | |
| parent | Add missing virtual destructors (diff) | |
| download | slicer-ce87f52fa9976b2d9633be9c25ef4321c56eb2e6.tar.bz2 slicer-ce87f52fa9976b2d9633be9c25ef4321c56eb2e6.tar.xz slicer-ce87f52fa9976b2d9633be9c25ef4321c56eb2e6.zip | |
Ice 3.7
Remove straggling references to IceUtil::Optional
Diffstat (limited to 'slicer/test')
| -rw-r--r-- | slicer/test/conversions.cpp | 4 | ||||
| -rw-r--r-- | slicer/test/conversions.h | 4 | ||||
| -rw-r--r-- | slicer/test/serializers.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/slicer/test/conversions.cpp b/slicer/test/conversions.cpp index edeadac..3c23814 100644 --- a/slicer/test/conversions.cpp +++ b/slicer/test/conversions.cpp @@ -90,7 +90,7 @@ namespace Slicer { } DLL_PUBLIC - IceUtil::Optional<Ice::Int> + Ice::optional<Ice::Int> str2int(const std::string & s) { if (s.empty()) { @@ -101,7 +101,7 @@ namespace Slicer { DLL_PUBLIC std::string - int2str(const IceUtil::Optional<Ice::Int> & i) + int2str(const Ice::optional<Ice::Int> & i) { if (!i) { return std::string(); diff --git a/slicer/test/conversions.h b/slicer/test/conversions.h index c540e77..5d45f7e 100644 --- a/slicer/test/conversions.h +++ b/slicer/test/conversions.h @@ -32,11 +32,11 @@ namespace Slicer { std::string dateTimeToString(const ::TestModule::DateTime & in); DLL_PUBLIC - IceUtil::Optional<Ice::Int> + Ice::optional<Ice::Int> str2int(const std::string &); DLL_PUBLIC std::string - int2str(const IceUtil::Optional<Ice::Int> &); + int2str(const Ice::optional<Ice::Int> &); } #endif diff --git a/slicer/test/serializers.cpp b/slicer/test/serializers.cpp index a94567e..e298fbd 100644 --- a/slicer/test/serializers.cpp +++ b/slicer/test/serializers.cpp @@ -28,7 +28,7 @@ BOOST_TEST_DONT_PRINT_LOG_VALUE ( TestModule::ClassMap::iterator ) BOOST_TEST_DONT_PRINT_LOG_VALUE ( TestModule::SomeNumbers ) namespace std { template<typename T> - ostream & operator<<(ostream & s, const IceUtil::Optional<T> &) { + ostream & operator<<(ostream & s, const Ice::optional<T> &) { return s; } } |