diff options
| -rw-r--r-- | slicer/slicer/modelParts.h | 3 | ||||
| -rw-r--r-- | slicer/slicer/slicer.h | 21 | ||||
| -rw-r--r-- | slicer/test/compilation.cpp | 6 | ||||
| -rw-r--r-- | slicer/test/serializers.cpp | 33 |
4 files changed, 0 insertions, 63 deletions
diff --git a/slicer/slicer/modelParts.h b/slicer/slicer/modelParts.h index c131dc8..6801e87 100644 --- a/slicer/slicer/modelParts.h +++ b/slicer/slicer/modelParts.h @@ -177,9 +177,6 @@ namespace Slicer { T & Model; }; - template<typename T> inline ModelPartPtr ModelPartFor(T & t) __attribute__ ((deprecated)); - template<typename T> inline ModelPartPtr ModelPartFor(T & t) { return ModelPart::CreateFor(t); } - class DLL_PUBLIC ModelPartForRootBase : public ModelPart { public: ModelPartForRootBase(ModelPartPtr mp); diff --git a/slicer/slicer/slicer.h b/slicer/slicer/slicer.h index 267b597..ba233bb 100644 --- a/slicer/slicer/slicer.h +++ b/slicer/slicer/slicer.h @@ -6,13 +6,6 @@ #include <slicer/serializer.h> namespace Slicer { - template <typename Deserializer, typename Object, typename ... SerializerParams> - IceInternal::Handle<Object> - Deserialize(SerializerParams && ... sp) __attribute__ ((deprecated)); - template <typename Deserializer, typename Object, typename ... SerializerParams> - void - Serialize(IceInternal::Handle<Object> object, SerializerParams && ... sp) __attribute__ ((deprecated)); - template <typename Object> Object DeserializeAnyWith(DeserializerPtr deserializer) @@ -29,13 +22,6 @@ namespace Slicer { return DeserializeAnyWith<Object>(new Deserializer(sp ...)); } - template <typename Deserializer, typename Object, typename ... SerializerParams> - IceInternal::Handle<Object> - Deserialize(SerializerParams && ... sp) - { - return DeserializeAny<Deserializer, IceInternal::Handle<Object>, SerializerParams...>(sp ...); - } - template <typename Object> void SerializeAnyWith(Object object, SerializerPtr serializer) @@ -49,13 +35,6 @@ namespace Slicer { { SerializeAnyWith(object, new Serializer(sp ...)); } - - template <typename Serializer, typename Object, typename ... SerializerParams> - void - Serialize(IceInternal::Handle<Object> object, SerializerParams && ... sp) - { - SerializeAny<Serializer>(object, sp ...); - } } #endif diff --git a/slicer/test/compilation.cpp b/slicer/test/compilation.cpp index bdfcca2..da13652 100644 --- a/slicer/test/compilation.cpp +++ b/slicer/test/compilation.cpp @@ -11,9 +11,6 @@ BOOST_TEST_DONT_PRINT_LOG_VALUE(std::type_info); #define TypeTest(Var, Expr, Explicit, Expected) \ Var obj = Expr; \ - Slicer::ModelPartPtr mppc = Slicer::ModelPartFor(obj); \ - BOOST_REQUIRE_EQUAL(Slicer::Expected, mppc->GetType()); \ - \ Slicer::ModelPartPtr mpp = Slicer::ModelPart::CreateFor(obj); \ BOOST_REQUIRE_EQUAL(Slicer::Expected, mpp->GetType()); \ \ @@ -27,8 +24,6 @@ BOOST_TEST_DONT_PRINT_LOG_VALUE(std::type_info); #define StackTypeTest(Var, Explicit, Expected) \ TypeTest(Var, Var(), Explicit, Expected) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" BOOST_AUTO_TEST_CASE( compile_auto_modelpart_type_class ) { TypeTest(TestModule::BuiltInsPtr, new TestModule::BuiltIns(), ModelPartForClass, mpt_Complex); @@ -103,5 +98,4 @@ BOOST_AUTO_TEST_CASE( compile_auto_modelpart_type_enum ) { StackTypeTest(TestModule::SomeNumbers, ModelPartForEnum, mpt_Simple); } -#pragma GCC diagnostic pop diff --git a/slicer/test/serializers.cpp b/slicer/test/serializers.cpp index 329135f..6218b3b 100644 --- a/slicer/test/serializers.cpp +++ b/slicer/test/serializers.cpp @@ -549,39 +549,6 @@ BOOST_AUTO_TEST_CASE( conversion ) boost::get<json::String>(*boost::get<json::Object>(v)["conv"])); } -BOOST_FIXTURE_TEST_SUITE ( compatWrapper, FileBased ); - -BOOST_AUTO_TEST_CASE( any ) -{ - BOOST_TEST_CHECKPOINT("Create folders"); - const fs::path tmpf = binDir / "compatWrapper"; - fs::create_directory(tmpf); - - BOOST_TEST_CHECKPOINT("Figure out paths"); - const boost::filesystem::path input = rootDir / "initial" / "builtins.xml"; - const boost::filesystem::path output = tmpf / "builtins.xml"; - - BOOST_TEST_CHECKPOINT("Deserialize with wrapper"); -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - TestModule::BuiltInsPtr object = Slicer::Deserialize<Slicer::XmlFileDeserializer, TestModule::BuiltIns>(input); -#pragma GCC diagnostic pop - - BOOST_TEST_CHECKPOINT("Test object"); - checkBuiltIns_valuesCorrect(object); - - BOOST_TEST_CHECKPOINT("Serialize with wrapper"); -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - Slicer::Serialize<Slicer::XmlFileSerializer>(object, output); -#pragma GCC diagnostic pop - - BOOST_TEST_CHECKPOINT("Checksum: " << input << " === " << output); - diff(input, output); -} - -BOOST_AUTO_TEST_SUITE_END(); - BOOST_AUTO_TEST_SUITE_END(); BOOST_AUTO_TEST_CASE( customerModelPartCounters ) |