v1.2.0 xmlシリアライズ対応 Issue #41

[skip ci] MinGWにおけるSharedLibrary不具合に対処 msvcとは異なる対処が必要だったのを忘れていた。 https://qiita.com/Chironian/items/3fb61cffa2a20dbee5c2#%EF%BC%92%EF%BC%94%E3%81%95%E3%81%A6%E5%95%8F%E9%A1%8C%E3%81%A7%E3%81%99 ------ auto generated message by Theolizer TheolizerDriver : c73353f6e351f02bef571977b3556724 TheolizerLibrary : e81c54dafab40aefd1581b30b1b3d545 Library's Header : 32dc5749d9e1f2110199f1267f787ef0 ------ end of message
yossi-tahara · Sep 29, 2017 · fff0cf2 · fff0cf2
1 parent e9cd8c0
commit fff0cf2
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 16 deletions.
diff --git a/build_tools/linux.cmake b/build_tools/linux.cmake
@@ -139,10 +139,10 @@ set(ENV{LC_ALL} "C")
 output_title("****** StaticWithBoost ******")
 build_by_gcc(gcc540 64 StaticWithBoost TRUE TRUE "39 1" "11 1")
 
-output_title("****** Static ******")
-build_by_gcc(gcc540 64 Static FALSE FALSE "38 1" "11 1")
-
 output_title("****** Shared ******")
 build_by_gcc(gcc540 64 Shared FALSE FALSE "38 1" "11 1")
 
+output_title("****** Static ******")
+build_by_gcc(gcc540 64 Static FALSE FALSE "38 1" "11 1")
+
 output_summary()
diff --git a/build_tools/windows.cmake b/build_tools/windows.cmake
@@ -142,16 +142,16 @@ build_by_msvc(msvc2017 32 StaticWithBoost TRUE TRUE "39 11 1 1")
 build_by_gcc( mingw710 64 StaticWithBoost TRUE TRUE "39 1" "11 1")
 build_by_gcc( mingw710 32 StaticWithBoost TRUE TRUE "39 1" "11 1")
 
-output_title("****** Static ******")
-build_by_msvc(msvc2017 64 Static FALSE FALSE "38 11 1 1")
-build_by_msvc(msvc2017 32 Static FALSE FALSE "38 11 1 1")
-build_by_gcc( mingw710 64 Static FALSE FALSE "38 1" "11 1")
-build_by_gcc( mingw710 32 Static FALSE FALSE "38 1" "11 1")
-
 output_title("****** Shared ******")
 build_by_msvc(msvc2017 64 Shared FALSE FALSE "38 11 1 1")
 build_by_msvc(msvc2017 32 Shared FALSE FALSE "38 11 1 1")
 build_by_gcc( mingw710 64 Shared FALSE FALSE "38 1" "11 1")
 build_by_gcc( mingw710 32 Shared FALSE FALSE "38 1" "11 1")
 
+output_title("****** Static ******")
+build_by_msvc(msvc2017 64 Static FALSE FALSE "38 11 1 1")
+build_by_msvc(msvc2017 32 Static FALSE FALSE "38 11 1 1")
+build_by_gcc( mingw710 64 Static FALSE FALSE "38 1" "11 1")
+build_by_gcc( mingw710 32 Static FALSE FALSE "38 1" "11 1")
+
 output_summary()
diff --git a/source/library/theolizer/internal/core_type_info.cpp b/source/library/theolizer/internal/core_type_info.cpp
@@ -121,5 +121,22 @@ return aTypeInfoListImpl[iTypeIndex]->getLastVersionNoV();
     return std::vector<unsigned>::at(iTypeIndex);
 }
 
+// ***************************************************************************
+//      プリミティブ管理クラス(シングルトン)
+//          プリミティブ型を型リストへ登録する
+// ***************************************************************************
+
+template<typename tPrimitiveType>
+PrimitiveTypeInfo<tPrimitiveType>& PrimitiveTypeInfo<tPrimitiveType>::getInstance()
+{
+    static PrimitiveTypeInfo<tPrimitiveType> instance;
+    return instance;
+}
+
+// 明示的実体化
+#define THEOLIZER_INTERNAL_DEF_PRIMITIVE(dType, dSymbol)                    \
+    template class PrimitiveTypeInfo<dType>;
+#include "primitive.inc"
+
 }   // namespace internal
 }   // namespace theolizer
diff --git a/source/library/theolizer/internal/core_type_info.h b/source/library/theolizer/internal/core_type_info.h
@@ -1022,11 +1022,7 @@ class THEOLIZER_INTERNAL_DLL PrimitiveTypeInfo : public BaseTypeInfo
     // コンストラクタ／デストラクタ
     PrimitiveTypeInfo() : BaseTypeInfo(etcPrimitiveType) { }
 public:
-    static PrimitiveTypeInfo& getInstance()
-    {
-        static PrimitiveTypeInfo instance;
-        return instance;
-    }
+    static PrimitiveTypeInfo& getInstance();
 
     // コピー／ムーブ禁止(仮想関数があるのでis_trivially_copyableにならない)
     PrimitiveTypeInfo(const PrimitiveTypeInfo&)  = delete;

diff --git a/source/test_library/serializer/test_serializer_base01a_normal.cpp b/source/test_library/serializer/test_serializer_base01a_normal.cpp
@@ -306,9 +306,7 @@ std::cout << "TestISerializerNormal(" << iFileName << ", "
     THEOLIZER_EQUAL(aString, "Test");
 
     NonIntrusiveDrived aNonIntrusiveDrived;
-std::cout << "pre  NonIntrusiveDrived ------\n";
     THEOLIZER_PROCESS(aSerializer, aNonIntrusiveDrived);
-std::cout << "post NonIntrusiveDrived ------\n";
     THEOLIZER_EQUAL(aNonIntrusiveDrived.mLong, -100);
     THEOLIZER_EQUAL(aNonIntrusiveDrived.mInt,  -101);