diff --git a/CMakeLists.txt b/CMakeLists.txt index 556e6d6..31b408a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,8 +71,8 @@ xo_add_genfacetimpl( FACET GCObject REPR String INPUT idl/IGCObject_DString.json5 - OUTPUT_HPP_DIR include/xo/object2 - OUTPUT_IMPL_SUBDIR string + OUTPUT_HPP_DIR include/xo/object2/string + OUTPUT_IMPL_SUBDIR . OUTPUT_CPP_DIR src/object2 ) diff --git a/idl/IGCObject_DString.json5 b/idl/IGCObject_DString.json5 index b8fcfba..8d0e14e 100644 --- a/idl/IGCObject_DString.json5 +++ b/idl/IGCObject_DString.json5 @@ -1,6 +1,7 @@ { mode: "implementation", - includes: [ "", + includes: [ + "", "" ], local_types: [ ], diff --git a/include/xo/object2/IGCObject_DString.hpp b/include/xo/object2/string/IGCObject_DString.hpp similarity index 100% rename from include/xo/object2/IGCObject_DString.hpp rename to include/xo/object2/string/IGCObject_DString.hpp diff --git a/src/object2/IGCObject_DString.cpp b/src/object2/IGCObject_DString.cpp index 72a8124..d411686 100644 --- a/src/object2/IGCObject_DString.cpp +++ b/src/object2/IGCObject_DString.cpp @@ -11,7 +11,7 @@ * [idl/IGCObject_DString.json5] **/ -#include "IGCObject_DString.hpp" +#include "string/IGCObject_DString.hpp" namespace xo { namespace scm { @@ -36,4 +36,4 @@ namespace xo { } /*namespace scm*/ } /*namespace xo*/ -/* end IGCObject_DString.cpp */ \ No newline at end of file +/* end IGCObject_DString.cpp */ diff --git a/src/object2/object2_register_facets.cpp b/src/object2/object2_register_facets.cpp index c33b063..8b9e810 100644 --- a/src/object2/object2_register_facets.cpp +++ b/src/object2/object2_register_facets.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/object2/object2_register_types.cpp b/src/object2/object2_register_types.cpp index 909d28a..b8b6875 100644 --- a/src/object2/object2_register_types.cpp +++ b/src/object2/object2_register_types.cpp @@ -8,6 +8,7 @@ #include "IGCObject_DList.hpp" #include "IGCObject_DFloat.hpp" #include "IGCObject_DInteger.hpp" +#include "string/IGCObject_DString.hpp" #include "IPrintable_DList.hpp" //#include "IPrintable_DFloat.hpp" @@ -17,12 +18,8 @@ #include namespace xo { -// using xo::print::APrintable; -// using xo::mm::AAllocator; using xo::mm::ACollector; using xo::mm::AGCObject; -// using xo::mm::IGCObject_Any; -// using xo::facet::FacetRegistry; using xo::facet::impl_for; using xo::facet::typeseq; using xo::scope; @@ -39,6 +36,10 @@ namespace xo { ok &= gc.install_type(impl_for()); + ok &= gc.install_type(impl_for()); + + ok &= gc.install_type(impl_for()); + return ok; } }