diff options
author | Dan Goodliffe <daniel.goodliffe@pressassociation.com> | 2016-10-20 10:28:51 +0100 |
---|---|---|
committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2016-10-22 12:45:16 +0100 |
commit | 6ce7a5e31e241da6707604440adc3c3dc32fde5d (patch) | |
tree | ec89199ebf90df8b5b2bcd0c3f8a1e0981949dbf | |
parent | Set cxxflags specifically, not cflags (diff) | |
download | slicer-6ce7a5e31e241da6707604440adc3c3dc32fde5d.tar.bz2 slicer-6ce7a5e31e241da6707604440adc3c3dc32fde5d.tar.xz slicer-6ce7a5e31e241da6707604440adc3c3dc32fde5d.zip |
Make hook parts dll private
-rw-r--r-- | slicer/slicer/modelPartsTypes.h | 6 | ||||
-rw-r--r-- | slicer/tool/parser.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/slicer/slicer/modelPartsTypes.h b/slicer/slicer/modelPartsTypes.h index d19f03d..6a464e8 100644 --- a/slicer/slicer/modelPartsTypes.h +++ b/slicer/slicer/modelPartsTypes.h @@ -101,7 +101,7 @@ namespace Slicer { template<typename T> class DLL_PUBLIC ModelPartForComplex : public ModelPartForComplexBase { public: - class HookBase : public HookCommon { + class DLL_PRIVATE HookBase : public HookCommon { public: virtual ModelPartPtr Get(T * t) const = 0; virtual const Metadata & GetMetadata() const override { return emptyMetadata; } @@ -109,7 +109,7 @@ namespace Slicer { typedef IceUtil::Handle<HookBase> HookPtr; template <typename MT, typename CT, MT CT::*M> - class HookMetadata : public HookBase { + class DLL_PRIVATE HookMetadata : public HookBase { public: virtual const Metadata & GetMetadata() const override { return metadata; } @@ -117,7 +117,7 @@ namespace Slicer { }; template <typename MT, typename CT, MT CT::*M, typename MP, typename Base = HookMetadata<MT, CT, M>> - class Hook : public Base { + class DLL_PRIVATE Hook : public Base { public: Hook(const std::string & n) : name(n) diff --git a/slicer/tool/parser.cpp b/slicer/tool/parser.cpp index f8ec87b..d492632 100644 --- a/slicer/tool/parser.cpp +++ b/slicer/tool/parser.cpp @@ -295,7 +295,7 @@ namespace Slicer { t = Slice::ClassDefPtr::dynamicCast(dm->container())->declaration(); } auto type = dm->type(); - fprintbf(cpp, "template<>\ntemplate<> DLL_PUBLIC\nconst Metadata\n"); + fprintbf(cpp, "template<>\ntemplate<> DLL_PRIVATE\nconst Metadata\n"); createNewModelPartPtrFor(it); fprintbf(cpp, "::HookMetadata< %s", Slice::typeToString(type, dm->optional())); |