Common: remove ugly fix for object_loader and object_saver

eagleivg · eagleivg · commit 3e74439a9be9 · 2018-06-12T20:02:15.000+03:00
diff --git a/src/Common/object_loader.h b/src/Common/object_loader.h
@@ -18,23 +18,14 @@ struct CLoader
     struct CHelper1
     {
         template <bool a>
-#if defined(WINDOWS)
-        static void load_data(T& data, M& stream, const P& /*p*/)
-#elif defined(LINUX)
-        static void load_data(std::enable_if_t<a, T&> data, M& stream, const P& /*p*/)
-#endif
+        static void load_data(std::enable_if_t<!a, T&> data, M& stream, const P& /*p*/)
         {
             static_assert(!std::is_polymorphic<T>::value, "Cannot load polymorphic classes as binary data.");
             stream.r(&data, sizeof(T));
         }
 
-#if defined(WINDOWS)
-        template <>
-        static void load_data<true>(T& data, M& stream, const P& /*p*/)
-#elif defined(LINUX)
         template <bool a>
-        static void load_data(std::enable_if_t<!a, T&> data, M& stream, const P& /*p*/)
-#endif
+        static void load_data(std::enable_if_t<a, T&> data, M& stream, const P& /*p*/)
         {
             T* data1 = const_cast<T*>(&data);
             data1->load(stream);
@@ -45,22 +36,13 @@ struct CLoader
     struct CHelper
     {
         template <bool pointer>
-#if defined(WINDOWS)
-        static void load_data(T& data, M& stream, const P& p)
-#elif defined(LINUX)
-        static void load_data(std::enable_if_t<pointer, T&> data, M& stream, const P& p)
-#endif
+        static void load_data(std::enable_if_t<!pointer, T&> data, M& stream, const P& p)
         {
             CHelper1<T>::load_data<object_type_traits::is_base_and_derived<ISerializable, T>::value>(data, stream, p);
         }
 
-#if defined(WINDOWS)
-            template <>
-            static void load_data<true>(T& data, M& stream, const P& p)
-#elif defined(LINUX)
         template <bool pointer>
-        static void load_data(std::enable_if_t<!pointer, T&> data, M& stream, const P& p)
-#endif
+        static void load_data(std::enable_if_t<pointer, T&> data, M& stream, const P& p)
         {
             CLoader<M, P>::load_data(*(data = new typename object_type_traits::remove_pointer<T>::type()), stream, p);
         }
@@ -94,24 +76,14 @@ struct CLoader
         template <typename T1, typename T2>
         struct add_helper
         {
-#if defined(WINDOWS)
-            template <bool>
-            static void add(T1& data, T2& value)
-#elif defined(LINUX)
             template <bool a>
-            static void add(std::enable_if_t<a, T1&> data, T2& value)
-#endif
+            static void add(std::enable_if_t<!a, T1&> data, T2& value)
             {
                 data.push_back(value);
             }
 
-#if defined(WINDOWS)
-            template <>
-            static void add<true>(T1& data, T2& value)
-#elif defined(LINUX)
             template <bool a>
-            static void add(std::enable_if_t<!a, T1&> data, T2& value)
-#endif
+            static void add(std::enable_if_t<a, T1&> data, T2& value)
             {
                 data.insert(value);
             }
@@ -143,22 +115,13 @@ struct CLoader
     struct CHelper4
     {
         template <bool a>
-#if defined(WINDOWS)
-        static void load_data(T& data, M& stream, const P& p)
-#elif defined(LINUX)
-        static void load_data(std::enable_if_t<a, T&> data, M& stream, const P& p)
-#endif
+        static void load_data(std::enable_if_t<!a, T&> data, M& stream, const P& p)
         {
             CHelper<T>::load_data<object_type_traits::is_pointer<T>::value>(data, stream, p);
         }
 
-#if defined(WINDOWS)
-        template <>
-        static void load_data<true>(T& data, M& stream, const P& p)
-#elif defined(LINUX)
         template <bool a>
-        static void load_data(std::enable_if_t<!a, T&> data, M& stream, const P& p)
-#endif
+        static void load_data(std::enable_if_t<a, T&> data, M& stream, const P& p)
         {
             CHelper3::load_data(data, stream, p);
         }
@@ -307,7 +270,7 @@ struct CLoader
     template <typename T>
     static void load_data(T& data, M& stream, const P& p)
     {
-        CHelper4<T>::load_data<object_type_traits::is_stl_container<T>::value>(data, stream, p);
+        CHelper4<T>::template load_data<object_type_traits::is_stl_container<T>::value>(data, stream, p);
     }
 };
 
diff --git a/src/Common/object_saver.h b/src/Common/object_saver.h
@@ -170,7 +170,7 @@ struct CSaver
     template <typename T>
     IC static void save_data(const T& data, M& stream, const P& p)
     {
-        CHelper4<T>::save_data<object_type_traits::is_stl_container<T>::value>(data, stream, p);
+        CHelper4<T>::template save_data<object_type_traits::is_stl_container<T>::value>(data, stream, p);
     }
 };
 

Original file line number	Diff line number	Diff line change
`@@ -18,23 +18,14 @@ struct CLoader`
`18`	`18`	`struct CHelper1`
`19`	`19`	`{`
`20`	`20`	`template <bool a>`
`21`		`-#if defined(WINDOWS)`
`22`		`- static void load_data(T& data, M& stream, const P& /p/)`
`23`		`-#elif defined(LINUX)`
`24`		`- static void load_data(std::enable_if_t<a, T&> data, M& stream, const P& /p/)`
`25`		`-#endif`
	`21`	`+ static void load_data(std::enable_if_t<!a, T&> data, M& stream, const P& /p/)`
`26`	`22`	`{`
`27`	`23`	`static_assert(!std::is_polymorphic<T>::value, "Cannot load polymorphic classes as binary data.");`
`28`	`24`	`stream.r(&data, sizeof(T));`
`29`	`25`	`}`
`30`	`26`
`31`		`-#if defined(WINDOWS)`
`32`		`- template <>`
`33`		`- static void load_data<true>(T& data, M& stream, const P& /p/)`
`34`		`-#elif defined(LINUX)`
`35`	`27`	`template <bool a>`
`36`		`- static void load_data(std::enable_if_t<!a, T&> data, M& stream, const P& /p/)`
`37`		`-#endif`
	`28`	`+ static void load_data(std::enable_if_t<a, T&> data, M& stream, const P& /p/)`
`38`	`29`	`{`
`39`	`30`	`T* data1 = const_cast<T*>(&data);`
`40`	`31`	`data1->load(stream);`
`@@ -45,22 +36,13 @@ struct CLoader`
`45`	`36`	`struct CHelper`
`46`	`37`	`{`
`47`	`38`	`template <bool pointer>`
`48`		`-#if defined(WINDOWS)`
`49`		`- static void load_data(T& data, M& stream, const P& p)`
`50`		`-#elif defined(LINUX)`
`51`		`- static void load_data(std::enable_if_t<pointer, T&> data, M& stream, const P& p)`
`52`		`-#endif`
	`39`	`+ static void load_data(std::enable_if_t<!pointer, T&> data, M& stream, const P& p)`
`53`	`40`	`{`
`54`	`41`	`CHelper1<T>::load_data<object_type_traits::is_base_and_derived<ISerializable, T>::value>(data, stream, p);`
`55`	`42`	`}`
`56`	`43`
`57`		`-#if defined(WINDOWS)`
`58`		`- template <>`
`59`		`- static void load_data<true>(T& data, M& stream, const P& p)`
`60`		`-#elif defined(LINUX)`
`61`	`44`	`template <bool pointer>`
`62`		`- static void load_data(std::enable_if_t<!pointer, T&> data, M& stream, const P& p)`
`63`		`-#endif`
	`45`	`+ static void load_data(std::enable_if_t<pointer, T&> data, M& stream, const P& p)`
`64`	`46`	`{`
`65`	`47`	`CLoader<M, P>::load_data(*(data = new typename object_type_traits::remove_pointer<T>::type()), stream, p);`
`66`	`48`	`}`
`@@ -94,24 +76,14 @@ struct CLoader`
`94`	`76`	`template <typename T1, typename T2>`
`95`	`77`	`struct add_helper`
`96`	`78`	`{`
`97`		`-#if defined(WINDOWS)`
`98`		`- template <bool>`
`99`		`- static void add(T1& data, T2& value)`
`100`		`-#elif defined(LINUX)`
`101`	`79`	`template <bool a>`
`102`		`- static void add(std::enable_if_t<a, T1&> data, T2& value)`
`103`		`-#endif`
	`80`	`+ static void add(std::enable_if_t<!a, T1&> data, T2& value)`
`104`	`81`	`{`
`105`	`82`	`data.push_back(value);`
`106`	`83`	`}`
`107`	`84`
`108`		`-#if defined(WINDOWS)`
`109`		`- template <>`
`110`		`- static void add<true>(T1& data, T2& value)`
`111`		`-#elif defined(LINUX)`
`112`	`85`	`template <bool a>`
`113`		`- static void add(std::enable_if_t<!a, T1&> data, T2& value)`
`114`		`-#endif`
	`86`	`+ static void add(std::enable_if_t<a, T1&> data, T2& value)`
`115`	`87`	`{`
`116`	`88`	`data.insert(value);`
`117`	`89`	`}`
`@@ -143,22 +115,13 @@ struct CLoader`
`143`	`115`	`struct CHelper4`
`144`	`116`	`{`
`145`	`117`	`template <bool a>`
`146`		`-#if defined(WINDOWS)`
`147`		`- static void load_data(T& data, M& stream, const P& p)`
`148`		`-#elif defined(LINUX)`
`149`		`- static void load_data(std::enable_if_t<a, T&> data, M& stream, const P& p)`
`150`		`-#endif`
	`118`	`+ static void load_data(std::enable_if_t<!a, T&> data, M& stream, const P& p)`
`151`	`119`	`{`
`152`	`120`	`CHelper<T>::load_data<object_type_traits::is_pointer<T>::value>(data, stream, p);`
`153`	`121`	`}`
`154`	`122`
`155`		`-#if defined(WINDOWS)`
`156`		`- template <>`
`157`		`- static void load_data<true>(T& data, M& stream, const P& p)`
`158`		`-#elif defined(LINUX)`
`159`	`123`	`template <bool a>`
`160`		`- static void load_data(std::enable_if_t<!a, T&> data, M& stream, const P& p)`
`161`		`-#endif`
	`124`	`+ static void load_data(std::enable_if_t<a, T&> data, M& stream, const P& p)`
`162`	`125`	`{`
`163`	`126`	`CHelper3::load_data(data, stream, p);`
`164`	`127`	`}`
`@@ -307,7 +270,7 @@ struct CLoader`
`307`	`270`	`template <typename T>`
`308`	`271`	`static void load_data(T& data, M& stream, const P& p)`
`309`	`272`	`{`
`310`		`- CHelper4<T>::load_data<object_type_traits::is_stl_container<T>::value>(data, stream, p);`
	`273`	`+ CHelper4<T>::template load_data<object_type_traits::is_stl_container<T>::value>(data, stream, p);`
`311`	`274`	`}`
`312`	`275`	`};`
`313`	`276`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ struct CSaver`
`170`	`170`	`template <typename T>`
`171`	`171`	`IC static void save_data(const T& data, M& stream, const P& p)`
`172`	`172`	`{`
`173`		`- CHelper4<T>::save_data<object_type_traits::is_stl_container<T>::value>(data, stream, p);`
	`173`	`+ CHelper4<T>::template save_data<object_type_traits::is_stl_container<T>::value>(data, stream, p);`
`174`	`174`	`}`
`175`	`175`	`};`
`176`	`176`