summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--slicer/db/sqlSelectDeserializer.cpp2
-rw-r--r--slicer/db/sqlSelectDeserializer.h6
-rw-r--r--slicer/db/testInsert.cpp2
-rw-r--r--slicer/db/testSelect.cpp10
-rw-r--r--slicer/db/testUpdate.cpp10
-rw-r--r--slicer/ice/testSpecifics.cpp6
-rw-r--r--slicer/slicer/modelParts.cpp4
-rw-r--r--slicer/slicer/modelParts.h6
-rw-r--r--slicer/slicer/modelPartsTypes.cpp16
-rw-r--r--slicer/slicer/modelPartsTypes.h14
-rw-r--r--slicer/slicer/modelPartsTypes.impl.h46
-rw-r--r--slicer/test/conversions.cpp4
-rw-r--r--slicer/test/conversions.h4
-rw-r--r--slicer/test/serializers.cpp2
-rw-r--r--slicer/tool/parser.cpp4
15 files changed, 68 insertions, 68 deletions
diff --git a/slicer/db/sqlSelectDeserializer.cpp b/slicer/db/sqlSelectDeserializer.cpp
index 0fa9892..f150bde 100644
--- a/slicer/db/sqlSelectDeserializer.cpp
+++ b/slicer/db/sqlSelectDeserializer.cpp
@@ -4,7 +4,7 @@
#include <common.h>
namespace Slicer {
- SqlSelectDeserializer::SqlSelectDeserializer(DB::SelectCommand * c, IceUtil::Optional<std::string> tc) :
+ SqlSelectDeserializer::SqlSelectDeserializer(DB::SelectCommand * c, Ice::optional<std::string> tc) :
cmd(c),
typeIdColName(tc)
{
diff --git a/slicer/db/sqlSelectDeserializer.h b/slicer/db/sqlSelectDeserializer.h
index af39039..96c7334 100644
--- a/slicer/db/sqlSelectDeserializer.h
+++ b/slicer/db/sqlSelectDeserializer.h
@@ -8,7 +8,7 @@
namespace Slicer {
class DLL_PUBLIC SqlSelectDeserializer : public Slicer::Deserializer {
public:
- SqlSelectDeserializer(DB::SelectCommand *, IceUtil::Optional<std::string> typeIdCol = IceUtil::Optional<std::string>());
+ SqlSelectDeserializer(DB::SelectCommand *, Ice::optional<std::string> typeIdCol = Ice::optional<std::string>());
virtual void Deserialize(Slicer::ModelPartForRootPtr) override;
@@ -20,8 +20,8 @@ namespace Slicer {
DB::SelectCommand * cmd;
unsigned int columnCount;
- IceUtil::Optional<std::string> typeIdColName;
- IceUtil::Optional<unsigned int> typeIdColIdx;
+ Ice::optional<std::string> typeIdColName;
+ Ice::optional<unsigned int> typeIdColIdx;
};
}
diff --git a/slicer/db/testInsert.cpp b/slicer/db/testInsert.cpp
index 7dbb6b7..3724679 100644
--- a/slicer/db/testInsert.cpp
+++ b/slicer/db/testInsert.cpp
@@ -19,7 +19,7 @@ BOOST_TEST_DONT_PRINT_LOG_VALUE(TestDatabase::Timespan);
namespace std {
template<typename T>
- ostream & operator<<(ostream & s, const IceUtil::Optional<T> &) {
+ ostream & operator<<(ostream & s, const Ice::optional<T> &) {
return s;
}
}
diff --git a/slicer/db/testSelect.cpp b/slicer/db/testSelect.cpp
index afcd3f2..d2c9b24 100644
--- a/slicer/db/testSelect.cpp
+++ b/slicer/db/testSelect.cpp
@@ -174,20 +174,20 @@ BOOST_AUTO_TEST_CASE( select_noRowsSimple )
BOOST_AUTO_TEST_CASE( select_noRowsSimpleOptional )
{
auto sel = db->select("SELECT id FROM test WHERE false");
- auto v = Slicer::DeserializeAny<Slicer::SqlSelectDeserializer, IceUtil::Optional<Ice::Int>>(sel.get());
+ auto v = Slicer::DeserializeAny<Slicer::SqlSelectDeserializer, Ice::optional<Ice::Int>>(sel.get());
BOOST_REQUIRE(!v);
}
BOOST_AUTO_TEST_CASE( select_tooManyRowsSimpleOptional )
{
auto sel = db->select("SELECT id FROM test");
- BOOST_REQUIRE_THROW(BoostThrowWrapperHelper<IceUtil::Optional<Ice::Int>>(sel.get()), Slicer::TooManyRowsReturned);
+ BOOST_REQUIRE_THROW(BoostThrowWrapperHelper<Ice::optional<Ice::Int>>(sel.get()), Slicer::TooManyRowsReturned);
}
BOOST_AUTO_TEST_CASE( select_simpleOptional )
{
auto sel = db->select("SELECT MAX(id) FROM test");
- auto v = Slicer::DeserializeAny<Slicer::SqlSelectDeserializer, IceUtil::Optional<Ice::Int>>(sel.get());
+ auto v = Slicer::DeserializeAny<Slicer::SqlSelectDeserializer, Ice::optional<Ice::Int>>(sel.get());
BOOST_REQUIRE(v);
BOOST_REQUIRE_EQUAL(4, *v);
}
@@ -201,7 +201,7 @@ BOOST_AUTO_TEST_CASE( select_noRowsComplexOptional )
string mstring \
FROM test \
WHERE false");
- auto v = Slicer::DeserializeAny<Slicer::SqlSelectDeserializer, IceUtil::Optional<TestModule::BuiltInsPtr>>(sel.get());
+ auto v = Slicer::DeserializeAny<Slicer::SqlSelectDeserializer, Ice::optional<TestModule::BuiltInsPtr>>(sel.get());
BOOST_REQUIRE(!v);
}
@@ -238,7 +238,7 @@ BOOST_AUTO_TEST_CASE( select_null )
BOOST_REQUIRE_EQUAL(*oi->optSimple, 4);
sel = db->select("SELECT MAX(id) FROM test WHERE false");
- auto v = Slicer::DeserializeAny<Slicer::SqlSelectDeserializer, IceUtil::Optional<Ice::Int>>(sel.get());
+ auto v = Slicer::DeserializeAny<Slicer::SqlSelectDeserializer, Ice::optional<Ice::Int>>(sel.get());
BOOST_REQUIRE(!v);
}
diff --git a/slicer/db/testUpdate.cpp b/slicer/db/testUpdate.cpp
index a76b9a1..48ea903 100644
--- a/slicer/db/testUpdate.cpp
+++ b/slicer/db/testUpdate.cpp
@@ -91,11 +91,11 @@ BOOST_AUTO_TEST_CASE( update_withNulls )
BOOST_REQUIRE_EQUAL("string updated", *bis[0]->mstring);
BOOST_REQUIRE_EQUAL("string", *bis[1]->mstring);
bis[0]->mstring = "not null"s;
- bis[1]->mstring = IceUtil::Optional<std::string>();
- bis[0]->mfloat = IceUtil::Optional<Ice::Float>();
- bis[1]->mbyte = IceUtil::Optional<Ice::Byte>();
- bis[0]->mshort = IceUtil::Optional<Ice::Short>();
- bis[1]->mdouble = IceUtil::Optional<Ice::Double>();
+ bis[1]->mstring = Ice::optional<std::string>();
+ bis[0]->mfloat = Ice::optional<Ice::Float>();
+ bis[1]->mbyte = Ice::optional<Ice::Byte>();
+ bis[0]->mshort = Ice::optional<Ice::Short>();
+ bis[1]->mdouble = Ice::optional<Ice::Double>();
BOOST_TEST_CHECKPOINT("Do update");
Slicer::SerializeAny<Slicer::SqlUpdateSerializer>(bis, db, "builtins");
auto bis2 = Slicer::DeserializeAny<Slicer::SqlSelectDeserializer, TestDatabase::BuiltInSeq>(sel.get());
diff --git a/slicer/ice/testSpecifics.cpp b/slicer/ice/testSpecifics.cpp
index 1689ed0..d45cf2c 100644
--- a/slicer/ice/testSpecifics.cpp
+++ b/slicer/ice/testSpecifics.cpp
@@ -55,13 +55,13 @@ testCompareOptional(const X & d)
{
BOOST_TEST_CHECKPOINT(typeid(X).name());
std::stringstream strm;
- IceUtil::Optional<X> x;
+ Ice::optional<X> x;
Slicer::SerializeAny<Slicer::IceStreamSerializer>(x, strm);
- auto x2 = Slicer::DeserializeAny<Slicer::IceStreamDeserializer, IceUtil::Optional<X>>(strm);
+ auto x2 = Slicer::DeserializeAny<Slicer::IceStreamDeserializer, Ice::optional<X>>(strm);
BOOST_REQUIRE(!x2);
x = d;
Slicer::SerializeAny<Slicer::IceStreamSerializer>(x, strm);
- auto x3 = Slicer::DeserializeAny<Slicer::IceStreamDeserializer, IceUtil::Optional<X>>(strm);
+ auto x3 = Slicer::DeserializeAny<Slicer::IceStreamDeserializer, Ice::optional<X>>(strm);
BOOST_REQUIRE_EQUAL(d, *x3);
}
diff --git a/slicer/slicer/modelParts.cpp b/slicer/slicer/modelParts.cpp
index 83d7833..3736156 100644
--- a/slicer/slicer/modelParts.cpp
+++ b/slicer/slicer/modelParts.cpp
@@ -25,10 +25,10 @@ namespace Slicer {
return TypeId();
}
- IceUtil::Optional<std::string>
+ Ice::optional<std::string>
ModelPart::GetTypeIdProperty() const
{
- return IceUtil::Optional<std::string>();
+ return Ice::optional<std::string>();
}
void
diff --git a/slicer/slicer/modelParts.h b/slicer/slicer/modelParts.h
index 08c1e0d..4994c68 100644
--- a/slicer/slicer/modelParts.h
+++ b/slicer/slicer/modelParts.h
@@ -1,7 +1,7 @@
#ifndef SLICER_MODELPARTS_H
#define SLICER_MODELPARTS_H
-#include <IceUtil/Optional.h>
+#include <Ice/Optional.h>
#include <Ice/InputStream.h>
#include <Ice/OutputStream.h>
#include <stdexcept>
@@ -68,7 +68,7 @@ namespace Slicer {
typedef std::shared_ptr<ModelPart> ModelPartPtr;
typedef std::shared_ptr<ModelPartForRootBase> ModelPartForRootPtr;
typedef std::unique_ptr<HookCommon> HookCommonPtr;
- typedef IceUtil::Optional<std::string> TypeId;
+ typedef Ice::optional<std::string> TypeId;
typedef boost::function<void(const std::string &, ModelPartPtr, const HookCommon *)> ChildHandler;
@@ -136,7 +136,7 @@ namespace Slicer {
virtual ChildRef GetChildRef(const std::string & memberName, const HookFilter & = HookFilter(), bool matchCase = true) = 0;
virtual ModelPartPtr GetSubclassModelPart(const std::string &);
virtual TypeId GetTypeId() const;
- virtual IceUtil::Optional<std::string> GetTypeIdProperty() const;
+ virtual Ice::optional<std::string> GetTypeIdProperty() const;
virtual ModelPartType GetType() const = 0;
virtual void Create();
virtual void Complete();
diff --git a/slicer/slicer/modelPartsTypes.cpp b/slicer/slicer/modelPartsTypes.cpp
index 3b2961c..37b9fce 100644
--- a/slicer/slicer/modelPartsTypes.cpp
+++ b/slicer/slicer/modelPartsTypes.cpp
@@ -66,14 +66,14 @@ namespace Slicer {
template<> const std::string Slicer::ModelPartForRoot<Ice::Int>::rootName = "Int";
template<> const std::string Slicer::ModelPartForRoot<Ice::Long>::rootName = "Long";
- template<> const std::string Slicer::ModelPartForRoot<IceUtil::Optional<std::string>>::rootName = "OptionalString";
- template<> const std::string Slicer::ModelPartForRoot<IceUtil::Optional<bool>>::rootName = "OptionalBoolean";
- template<> const std::string Slicer::ModelPartForRoot<IceUtil::Optional<Ice::Float>>::rootName = "OptionalFloat";
- template<> const std::string Slicer::ModelPartForRoot<IceUtil::Optional<Ice::Double>>::rootName = "OptionalDouble";
- template<> const std::string Slicer::ModelPartForRoot<IceUtil::Optional<Ice::Byte>>::rootName = "OptionalByte";
- template<> const std::string Slicer::ModelPartForRoot<IceUtil::Optional<Ice::Short>>::rootName = "OptionalShort";
- template<> const std::string Slicer::ModelPartForRoot<IceUtil::Optional<Ice::Int>>::rootName = "OptionalInt";
- template<> const std::string Slicer::ModelPartForRoot<IceUtil::Optional<Ice::Long>>::rootName = "OptionalLong";
+ template<> const std::string Slicer::ModelPartForRoot<Ice::optional<std::string>>::rootName = "OptionalString";
+ template<> const std::string Slicer::ModelPartForRoot<Ice::optional<bool>>::rootName = "OptionalBoolean";
+ template<> const std::string Slicer::ModelPartForRoot<Ice::optional<Ice::Float>>::rootName = "OptionalFloat";
+ template<> const std::string Slicer::ModelPartForRoot<Ice::optional<Ice::Double>>::rootName = "OptionalDouble";
+ template<> const std::string Slicer::ModelPartForRoot<Ice::optional<Ice::Byte>>::rootName = "OptionalByte";
+ template<> const std::string Slicer::ModelPartForRoot<Ice::optional<Ice::Short>>::rootName = "OptionalShort";
+ template<> const std::string Slicer::ModelPartForRoot<Ice::optional<Ice::Int>>::rootName = "OptionalInt";
+ template<> const std::string Slicer::ModelPartForRoot<Ice::optional<Ice::Long>>::rootName = "OptionalLong";
MODELPARTFOR(std::string, ModelPartForSimple);
MODELPARTFOR(bool, ModelPartForSimple);
diff --git a/slicer/slicer/modelPartsTypes.h b/slicer/slicer/modelPartsTypes.h
index 3f26046..89f09c7 100644
--- a/slicer/slicer/modelPartsTypes.h
+++ b/slicer/slicer/modelPartsTypes.h
@@ -86,12 +86,12 @@ namespace Slicer {
virtual bool GetValue(ValueTarget && s) override;
};
- template<typename T, typename M, IceUtil::Optional<T> M::* MV>
- class DLL_PUBLIC ModelPartForConverted<IceUtil::Optional<T>, M, MV> : public ModelPartForConvertedBase, protected ModelPartModel<IceUtil::Optional<T>> {
+ template<typename T, typename M, Ice::optional<T> M::* MV>
+ class DLL_PUBLIC ModelPartForConverted<Ice::optional<T>, M, MV> : public ModelPartForConvertedBase, protected ModelPartModel<Ice::optional<T>> {
public:
- typedef IceUtil::Optional<T> element_type;
+ typedef Ice::optional<T> element_type;
- ModelPartForConverted(IceUtil::Optional<T> * h);
+ ModelPartForConverted(Ice::optional<T> * h);
virtual void SetValue(ValueSource && s) override;
virtual bool GetValue(ValueTarget && s) override;
@@ -115,9 +115,9 @@ namespace Slicer {
};
template<typename T>
- class DLL_PUBLIC ModelPartForOptional : public ModelPartForOptionalBase, protected ModelPartModel<IceUtil::Optional<typename T::element_type> > {
+ class DLL_PUBLIC ModelPartForOptional : public ModelPartForOptionalBase, protected ModelPartModel<Ice::optional<typename T::element_type> > {
public:
- ModelPartForOptional(IceUtil::Optional< typename T::element_type > * h);
+ ModelPartForOptional(Ice::optional< typename T::element_type > * h);
virtual void Create() override;
virtual bool GetValue(ValueTarget && s) override;
virtual ModelPartType GetType() const override;
@@ -228,7 +228,7 @@ namespace Slicer {
template<typename dummy = T>
std::string getTypeId(typename std::enable_if<!std::is_base_of<Ice::Object, dummy>::value>::type * = nullptr) const;
- virtual IceUtil::Optional<std::string> GetTypeIdProperty() const override;
+ virtual Ice::optional<std::string> GetTypeIdProperty() const override;
static const std::string typeIdProperty;
static const std::string * className;
diff --git a/slicer/slicer/modelPartsTypes.impl.h b/slicer/slicer/modelPartsTypes.impl.h
index 03af7c1..dfef37d 100644
--- a/slicer/slicer/modelPartsTypes.impl.h
+++ b/slicer/slicer/modelPartsTypes.impl.h
@@ -14,15 +14,15 @@
template<> ModelPartPtr ModelPart::CreateFor<Type>() { return std::make_shared<ModelPartType>(nullptr); } \
template<> ModelPartPtr ModelPart::CreateFor(Type & s) { return std::make_shared<ModelPartType>(&s); } \
template<> ModelPartPtr ModelPart::CreateFor(const Type & s) { return CreateFor(const_cast<Type &>(s)); } \
- template<> ModelPartPtr ModelPart::CreateFor(IceUtil::Optional<Type> & s) { return std::make_shared<ModelPartForOptional<ModelPartType>>(&s); } \
- template<> ModelPartPtr ModelPart::CreateFor(const IceUtil::Optional<Type> & s) { return CreateFor(const_cast<IceUtil::Optional<Type> &>(s)); } \
+ template<> ModelPartPtr ModelPart::CreateFor(Ice::optional<Type> & s) { return std::make_shared<ModelPartForOptional<ModelPartType>>(&s); } \
+ template<> ModelPartPtr ModelPart::CreateFor(const Ice::optional<Type> & s) { return CreateFor(const_cast<Ice::optional<Type> &>(s)); } \
template<> ModelPartForRootPtr ModelPart::CreateRootFor(Type & s) { return std::make_shared<ModelPartForRoot<Type>>(&s); } \
- template<> ModelPartForRootPtr ModelPart::CreateRootFor(IceUtil::Optional<Type> & s) { return std::make_shared<ModelPartForRoot<IceUtil::Optional<Type>>>(&s); } \
+ template<> ModelPartForRootPtr ModelPart::CreateRootFor(Ice::optional<Type> & s) { return std::make_shared<ModelPartForRoot<Ice::optional<Type>>>(&s); } \
template<> ModelPartForRootPtr ModelPart::CreateRootFor(const Type & s) { return CreateRootFor(const_cast<Type &>(s)); } \
- template<> ModelPartForRootPtr ModelPart::CreateRootFor(const IceUtil::Optional<Type> & s) { return CreateRootFor(const_cast<IceUtil::Optional<Type> &>(s)); } \
+ template<> ModelPartForRootPtr ModelPart::CreateRootFor(const Ice::optional<Type> & s) { return CreateRootFor(const_cast<Ice::optional<Type> &>(s)); } \
template class BaseModelPart; \
template class ModelPartForRoot<Type>; \
- template class ModelPartForRoot< IceUtil::Optional<Type> >; \
+ template class ModelPartForRoot< Ice::optional<Type> >; \
#define MODELPARTFOR(Type, ModelPartType) \
CUSTOMMODELPARTFOR(Type, ModelPartType<Type>, ModelPartType<Type>)
@@ -56,7 +56,7 @@ namespace Slicer {
template<typename T>
void
- typeWrite(::Ice::OutputStream & s, const ::IceUtil::Optional<T> & m)
+ typeWrite(::Ice::OutputStream & s, const ::Ice::optional<T> & m)
{
if constexpr (!Slicer::isLocal<T>::value) {
typedef Ice::StreamableTraits<T> traits;
@@ -86,7 +86,7 @@ namespace Slicer {
template<typename T>
void
- typeRead(::Ice::InputStream & s, ::IceUtil::Optional<T> & m)
+ typeRead(::Ice::InputStream & s, ::Ice::optional<T> & m)
{
if constexpr (!Slicer::isLocal<T>::value) {
typedef Ice::StreamableTraits<T> traits;
@@ -159,14 +159,14 @@ namespace Slicer {
{
}
- template<typename T, typename M, IceUtil::Optional<T> M::* MV>
- ModelPartForConverted<IceUtil::Optional<T>, M, MV>::ModelPartForConverted(IceUtil::Optional<T> * h) :
- ModelPartModel<IceUtil::Optional<T>>(h)
+ template<typename T, typename M, Ice::optional<T> M::* MV>
+ ModelPartForConverted<Ice::optional<T>, M, MV>::ModelPartForConverted(Ice::optional<T> * h) :
+ ModelPartModel<Ice::optional<T>>(h)
{
}
- template<typename T, typename M, IceUtil::Optional<T> M::* MV>
- bool ModelPartForConverted<IceUtil::Optional<T>, M, MV>::HasValue() const
+ template<typename T, typename M, Ice::optional<T> M::* MV>
+ bool ModelPartForConverted<Ice::optional<T>, M, MV>::HasValue() const
{
BOOST_ASSERT(this->Model);
return (bool)*this->Model;
@@ -189,22 +189,22 @@ namespace Slicer {
T & operator()(T & x) const { return x; }
const T & operator()(const T & x) const { return x; }
template <typename Y>
- T & operator()(IceUtil::Optional<Y> & x) const { if (!x) x = Y(); return *x; }
+ T & operator()(Ice::optional<Y> & x) const { if (!x) x = Y(); return *x; }
template <typename Y>
- const T & operator()(const IceUtil::Optional<Y> & x) const { return *x; }
+ const T & operator()(const Ice::optional<Y> & x) const { return *x; }
static bool valueExists(const T &) { return true; }
- static bool valueExists(const IceUtil::Optional<T> & y) { return y.has_value(); }
+ static bool valueExists(const Ice::optional<T> & y) { return y.has_value(); }
};
template <typename X>
- struct Coerce<IceUtil::Optional<X>> {
+ struct Coerce<Ice::optional<X>> {
typedef typename std::remove_const<typename std::remove_reference<X>::type>::type T;
- IceUtil::Optional<T> & operator()(IceUtil::Optional<T> & x) const { return x; }
- const IceUtil::Optional<T> & operator()(const IceUtil::Optional<T> & x) const { return x; }
+ Ice::optional<T> & operator()(Ice::optional<T> & x) const { return x; }
+ const Ice::optional<T> & operator()(const Ice::optional<T> & x) const { return x; }
template <typename Y>
- IceUtil::Optional<T> operator()(Y & y) const { return y; }
+ Ice::optional<T> operator()(Y & y) const { return y; }
static bool valueExists(const T &) { return true; }
- static bool valueExists(const IceUtil::Optional<T> &) { return true; }
+ static bool valueExists(const Ice::optional<T> &) { return true; }
};
template<typename ET, typename MT, typename Conv>
@@ -272,8 +272,8 @@ namespace Slicer {
// ModelPartForOptional
template<typename T>
- ModelPartForOptional<T>::ModelPartForOptional(IceUtil::Optional< typename T::element_type > * h) :
- ModelPartModel<IceUtil::Optional< typename T::element_type> >(h)
+ ModelPartForOptional<T>::ModelPartForOptional(Ice::optional< typename T::element_type > * h) :
+ ModelPartModel<Ice::optional< typename T::element_type> >(h)
{
if (this->Model && *this->Model) {
modelPart = std::make_shared<T>(&**this->Model);
@@ -445,7 +445,7 @@ namespace Slicer {
}
template<typename T>
- IceUtil::Optional<std::string> ModelPartForClass<T>::GetTypeIdProperty() const
+ Ice::optional<std::string> ModelPartForClass<T>::GetTypeIdProperty() const
{
return typeIdProperty;
}
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;
}
}
diff --git a/slicer/tool/parser.cpp b/slicer/tool/parser.cpp
index c05e2e6..d743f57 100644
--- a/slicer/tool/parser.cpp
+++ b/slicer/tool/parser.cpp
@@ -152,7 +152,7 @@ namespace Slicer {
fprintbf(cpp, "const std::string ModelPartForRoot< %s >::rootName(\"%s\");\n\n",
type, name);
fprintbf(cpp, "template<> DLL_PUBLIC\n");
- fprintbf(cpp, "const std::string ModelPartForRoot< IceUtil::Optional< %s > >::rootName(\"Optional%s\");\n\n",
+ fprintbf(cpp, "const std::string ModelPartForRoot< Ice::optional< %s > >::rootName(\"Optional%s\");\n\n",
type, name);
}
@@ -431,7 +431,7 @@ namespace Slicer {
{
fprintbf(cpp, "ModelPartForConverted< ");
if (dm->optional()) {
- fprintbf(cpp, "IceUtil::Optional< %s >",
+ fprintbf(cpp, "Ice::optional< %s >",
Slice::typeToString(type));
}
else {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 22:03:02 +0000