issue76fix_proposal

alib2std/src/extensions/type_traits.hpp

@@ -45,33 +45,6 @@ namespace std {
 		typedef typename get_type_pack_element < N - 1, Ts ... >::type type;
 	};
-	template<typename T>
-	bool is_same_type(const char* name) {
-		int status;
-
-		char namespaceId[100];
-		char classId[100];
-		char* ret = abi::__cxa_demangle(typeid(T).name(), 0, 0, &status);
-		sscanf(ret, "%[a-zA-Z]::%[a-zA-Z]", namespaceId, classId);
-		free( ret );
-
-		if(strcmp(classId, name) == 0) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	template <class T>
-	char* type_name() {
-		int status;
-
-		return abi::__cxa_demangle(typeid(T).name(), 0, 0, &status);
-	}
-
-	char* type_name(const std::type_info& type);
-	char* type_name(const std::type_index& type);
-
 } /* namespace std */
 #endif // TYPE_TRAITS_HPP_

alib2std/src/extensions/type_traits.cpp → alib2std/src/extensions/typeinfo.cpp

@@ -5,7 +5,7 @@
  * Author: Jan Travnicek
  */
-#include "../type_traits"
+#include "../typeinfo"
 namespace std {

alib2std/src/extensions/typeinfo.hpp

+/*
+ * typeindex.hpp
+ *
+ * Created on: Apr 1, 2013
+ * Author: Jan Travnicek
+ */
+
+#ifndef TYPEINFO_H_
+#define TYPEINFO_H_
+
+namespace std {
+
+	char* type_name(const std::type_info& type);
+	char* type_name(const std::type_index& type);
+
+	template <class T>
+	char* type_name() {
+		return type_name(typeid(T));
+	}
+
+	template<typename T>
+	bool is_same_type(const char* name) {
+		char namespaceId[100];
+		char classId[100];
+		char* ret = type_name<T>();
+		sscanf(ret, "%[a-zA-Z]::%[a-zA-Z]", namespaceId, classId);
+		free( ret );
+
+		if(strcmp(classId, name) == 0) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+}
+
+#endif // ifndef TYPEINFO_H_

alib2std/src/type_traits

@@ -2,11 +2,6 @@
 #define __TYPE_TRAITS_HEADER_WRAPPER_
 #include <bits/../type_traits>
-#include <cxxabi.h>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <typeindex>
 #include "extensions/type_traits.hpp"
 #endif /* __TYPE_TRAITS_HEADER_WRAPPER_ */

alib2std/src/typeinfo

+#ifndef __TYPEINFO_HEADER_WRAPPER_
+#define __TYPEINFO_HEADER_WRAPPER_
+
+#include <bits/../typeinfo>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cxxabi.h>
+#include "typeindex"
+#include "extensions/typeinfo.hpp"
+
+#endif /* __TYPEINFO_HEADER_WRAPPER_ */