Merge pull request cpgf#72 from cpgf/master

Master

Author: wqking

include/cpgf/metatraits/gmetaconverter.h

@@ -3,6 +3,7 @@
 
 #include "cpgf/gapiutil.h"
 
+#include <type_traits>
 
 namespace cpgf {
 
@@ -51,7 +52,7 @@ struct GMetaTraitsCreateConverter
 template <typename T>
 IMetaConverter * createConverterFromMetaTraits(const GMetaTraitsParam & param, T *)
 {
-	return GMetaTraitsCreateConverter<T>::createConverter(param);
+	return GMetaTraitsCreateConverter<typename std::remove_cv<typename std::remove_reference<T>::type>::type>::createConverter(param);
 }
 
 } // namespace cpgf

include/cpgf/metatraits/gmetaobjectlifemanager.h

@@ -3,9 +3,9 @@
 
 #include "cpgf/gapi.h"
 
+#include <type_traits>
 #include <cstddef>
 
-
 namespace cpgf {
 
 struct GMetaTraitsParam;
@@ -41,7 +41,7 @@ struct GMetaTraitsCreateObjectLifeManager
 template <typename T>
 IMetaObjectLifeManager * createObjectLifeManagerFromMetaTraits(const GMetaTraitsParam & param, T *)
 {
-	IMetaObjectLifeManager * objectLifeManager = GMetaTraitsCreateObjectLifeManager<T>::createObjectLifeManager(param);
+	IMetaObjectLifeManager * objectLifeManager = GMetaTraitsCreateObjectLifeManager<typename std::remove_cv<typename std::remove_reference<T>::type>::type>::createObjectLifeManager(param);
 	if(objectLifeManager == nullptr) {
 		objectLifeManager = metatraits_internal::createDefaultObjectLifeManagerFromMetaTraits();
 	}

include/cpgf/metatraits/gmetaserializer.h

@@ -1,9 +1,9 @@
 #ifndef CPGF_GMETASERIALIZER_H
 #define CPGF_GMETASERIALIZER_H
 
-
 #include "cpgf/gapiutil.h"
 
+#include <type_traits>
 
 namespace cpgf {
 
@@ -43,7 +43,7 @@ struct GMetaTraitsCreateSerializer
 template <typename T>
 IMetaSerializer * createSerializerFromMetaTraits(const GMetaTraitsParam & param, T *)
 {
-	return GMetaTraitsCreateSerializer<T>::createSerializer(param);
+	return GMetaTraitsCreateSerializer<typename std::remove_cv<typename std::remove_reference<T>::type>::type>::createSerializer(param);
 }
 
 } // namespace cpgf

include/cpgf/metatraits/gmetasharedptrtraits.h

@@ -4,6 +4,7 @@
 #include "cpgf/gapiutil.h"
 #include "cpgf/gmetatype.h"
 
+#include <type_traits>
 
 namespace cpgf {
 
@@ -60,7 +61,7 @@ struct GMetaTraitsCreateSharedPointerTraits
 template <typename T>
 IMetaSharedPointerTraits * createSharedPointerTraitsFromMetaTraits(const GMetaTraitsParam & param, T *)
 {
-	return GMetaTraitsCreateSharedPointerTraits<T>::createSharedPointerTraits(param);
+	return GMetaTraitsCreateSharedPointerTraits<typename std::remove_cv<typename std::remove_reference<T>::type>::type>::createSharedPointerTraits(param);
 }
 
 } // namespace cpgf

src/gexception.cpp

@@ -88,6 +88,8 @@ const char * GException::getMessage() const
 
 void raiseException(int errorCode, const char *  message)
 {
+//	fprintf(stderr, "%s\n", message);
+
 	throw GException(errorCode, message);
 }