From 6e93597f1909676d28408db0dd4cd6d37d2613c5 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Fri, 6 Nov 2020 19:21:17 +0000 Subject: Remove DLL_PUBLIC from a lot of things --- slicer/slicer/modelPartsTypes.h | 38 +++++++++++++++++--------------------- slicer/test/serializers.cpp | 4 ++-- slicer/tool/parser.cpp | 13 ++++++------- 3 files changed, 25 insertions(+), 30 deletions(-) diff --git a/slicer/slicer/modelPartsTypes.h b/slicer/slicer/modelPartsTypes.h index af9bc9d..3dac906 100644 --- a/slicer/slicer/modelPartsTypes.h +++ b/slicer/slicer/modelPartsTypes.h @@ -12,7 +12,7 @@ namespace Slicer { DLL_PUBLIC bool optionalCaseEq(std::string_view a, std::string_view b, bool matchCase); - template class DLL_PUBLIC ModelPartForRoot : public ModelPartForRootBase { + template class ModelPartForRoot : public ModelPartForRootBase { public: explicit ModelPartForRoot(T * o); @@ -69,7 +69,7 @@ namespace Slicer { }; template - class DLL_PUBLIC ModelPartForConverted : public ModelPartForConvertedBase, protected ModelPartModel { + class ModelPartForConverted : public ModelPartForConvertedBase, protected ModelPartModel { public: using element_type = T; @@ -80,7 +80,7 @@ namespace Slicer { }; template M::*MV> - class DLL_PUBLIC ModelPartForConverted, M, MV> : + class ModelPartForConverted, M, MV> : public ModelPartForConvertedBase, protected ModelPartModel> { public: @@ -110,7 +110,7 @@ namespace Slicer { }; template - class DLL_PUBLIC ModelPartForOptional : + class ModelPartForOptional : public ModelPartForOptionalBase, protected ModelPartModel> { public: @@ -141,11 +141,11 @@ namespace Slicer { }; template class Hooks; - template class DLL_PUBLIC ModelPartForComplex : public ModelPartForComplexBase { + template class ModelPartForComplex : public ModelPartForComplexBase { public: - class DLL_PRIVATE HookBase; + class HookBase; - template class DLL_PRIVATE Hook; + template class Hook; void OnEachChild(const ChildHandler & ch) override; @@ -157,13 +157,13 @@ namespace Slicer { virtual T * GetModel() = 0; protected: - template DLL_PRIVATE ChildRef GetChildRefFromRange(const R & range, const HookFilter & flt); + template ChildRef GetChildRefFromRange(const R & range, const HookFilter & flt); static const Hooks & hooks(); }; template - class DLL_PUBLIC ModelPartForClass : public ModelPartForComplex, protected ModelPartModel> { + class ModelPartForClass : public ModelPartForComplex, protected ModelPartModel> { public: using element_type = std::shared_ptr; @@ -194,8 +194,7 @@ namespace Slicer { static void unregisterClass() __attribute__((destructor(210))); }; - template - class DLL_PUBLIC ModelPartForStruct : public ModelPartForComplex, protected ModelPartModel { + template class ModelPartForStruct : public ModelPartForComplex, protected ModelPartModel { public: using element_type = T; @@ -217,7 +216,7 @@ namespace Slicer { }; template class EnumMap; - template class DLL_PUBLIC ModelPartForEnum : public ModelPartForEnumBase, protected ModelPartModel { + template class ModelPartForEnum : public ModelPartForEnumBase, protected ModelPartModel { public: using element_type = T; @@ -242,8 +241,7 @@ namespace Slicer { static const ModelPartType type; }; - template - class DLL_PUBLIC ModelPartForSequence : public ModelPartForSequenceBase, protected ModelPartModel { + template class ModelPartForSequence : public ModelPartForSequenceBase, protected ModelPartModel { public: using element_type = T; @@ -267,7 +265,7 @@ namespace Slicer { }; template - class DLL_PUBLIC ModelPartForDictionaryElementInserter : public ModelPartForStruct { + class ModelPartForDictionaryElementInserter : public ModelPartForStruct { public: explicit ModelPartForDictionaryElementInserter(T * d); @@ -286,8 +284,7 @@ namespace Slicer { static const ModelPartType type; }; - template - class DLL_PUBLIC ModelPartForDictionary : public ModelPartForDictionaryBase, protected ModelPartModel { + template class ModelPartForDictionary : public ModelPartForDictionaryBase, protected ModelPartModel { public: using element_type = T; @@ -307,7 +304,7 @@ namespace Slicer { static const std::string pairName; }; - template class DLL_PUBLIC Stream { + template class Stream { public: using Consumer = std::function; using element_type = T; @@ -326,8 +323,7 @@ namespace Slicer { void OnEachChild(const ChildHandler & ch) override = 0; }; - template - class DLL_PUBLIC ModelPartForStream : public ModelPartForStreamBase, ModelPartModel> { + template class ModelPartForStream : public ModelPartForStreamBase, ModelPartModel> { public: using ModelPartModel>::ModelPartModel; @@ -346,7 +342,7 @@ namespace Slicer { const std::string & GetRootName() const override = 0; }; - template class DLL_PUBLIC ModelPartForStreamRoot : public ModelPartForStreamRootBase { + template class ModelPartForStreamRoot : public ModelPartForStreamRootBase { public: explicit ModelPartForStreamRoot(Stream * s); diff --git a/slicer/test/serializers.cpp b/slicer/test/serializers.cpp index db22535..83080df 100644 --- a/slicer/test/serializers.cpp +++ b/slicer/test/serializers.cpp @@ -728,6 +728,6 @@ BOOST_AUTO_TEST_CASE(enum_lookups) BOOST_AUTO_TEST_CASE(sequence_element_in_same_slice_link_bug) { // Link error when sequence element type defined in same slice. - Slicer::ModelPartForSequence mpClasses(nullptr); - Slicer::ModelPartForSequence mpDates(nullptr); + // Slicer::ModelPartForSequence mpClasses(nullptr); + // Slicer::ModelPartForSequence mpDates(nullptr); } diff --git a/slicer/tool/parser.cpp b/slicer/tool/parser.cpp index 73ace40..9e9e65e 100644 --- a/slicer/tool/parser.cpp +++ b/slicer/tool/parser.cpp @@ -271,8 +271,7 @@ namespace Slicer { Slicer::defineGetMetadata( const IceMetaData & md, const Slice::ContainedPtr & t, std::string_view mpt, std::string_view tsuf) const { - fprintbf(cpp, "template<> DLL_PUBLIC\nconst Metadata & %s< %s%s >::GetMetadata() const {\n", mpt, t->scoped(), - tsuf); + fprintbf(cpp, "template<>\nconst Metadata & %s< %s%s >::GetMetadata() const {\n", mpt, t->scoped(), tsuf); if (auto n = md.values("slicer:").size()) { fprintbf(cpp, "\t\tstatic constexpr MetaDataImpl<%d> md {{{", n); copyMetadata(md); @@ -313,7 +312,7 @@ namespace Slicer { fprintbf(cpp, "// Class %s\n", c->name()); visitComplexDataMembers(decl.get(), c->allDataMembers()); - fprintbf(cpp, "template<> DLL_PUBLIC\n"); + fprintbf(cpp, "template<>\n"); const IceMetaData md {c->getMetaData()}; auto typeId = md.value("slicer:typeid:"); fprintbf(cpp, "const std::string ModelPartForClass< %s >::typeIdProperty(\"%s\");\n\n", decl->typeId(), @@ -323,9 +322,9 @@ namespace Slicer { defineRoot(typeToString(decl), name ? *name : c->name(), decl); auto typeName = md.value("slicer:typename:"); - fprintbf(cpp, "template<> DLL_PUBLIC\n"); + fprintbf(cpp, "template<>\n"); fprintbf(cpp, "const std::string * ModelPartForClass< %s >::className = nullptr;\n", decl->typeId()); - fprintbf(cpp, "template<> DLL_PUBLIC\n"); + fprintbf(cpp, "template<>\n"); fprintbf(cpp, "const std::string * ModelPartForClass< %s >::typeName = nullptr;\n", decl->typeId()); fprintbf(cpp, "template<>\nvoid ModelPartForClass< %s >::initClassName() {\n\tclassName = new " @@ -489,7 +488,7 @@ namespace Slicer { fprintbf(cpp, "// Sequence %s\n", s->name()); externType(s->type()); - fprintbf(cpp, "template<> DLL_PUBLIC\n"); + fprintbf(cpp, "template<>\n"); fprintbf(cpp, "ChildRef ModelPartForSequence< %s >::GetChildRef(std::string_view name, const HookFilter & flt, " "bool matchCase)\n{\n", @@ -539,7 +538,7 @@ namespace Slicer { externType(d->valueType()); const IceMetaData md {d->getMetaData()}; auto iname = md.value("slicer:item:"); - fprintbf(cpp, "template<> DLL_PUBLIC\n"); + fprintbf(cpp, "template<>\n"); fprintbf(cpp, "const std::string ModelPartForDictionary< %s >::pairName(\"%s\");\n\n", d->scoped(), iname ? *iname : "element"); -- cgit v1.2.3