aboutsummaryrefslogtreecommitdiff
path: root/Gem/develop
diff options
context:
space:
mode:
authorTravis CI <zmoelnig@travis-ci.umlaeute.mur.at>2018-12-18 14:24:30 +0000
committerTravis CI <zmoelnig@travis-ci.umlaeute.mur.at>2018-12-18 14:24:30 +0000
commite508a6b52850f4138348f8e0fb10e5d1e2e26f16 (patch)
tree24d050bd3b53e273f94490298f4d61043cad391a /Gem/develop
parent7cc76de6eedd4af985743c9cf464b68c99913114 (diff)
Gem 51a2c26d1617a5e7d6775e147a6823347e317821 osx/i386
built 'master:51a2c26d1617a5e7d6775e147a6823347e317821' for osx/i386
Diffstat (limited to 'Gem/develop')
-rw-r--r--Gem/develop/include/Gem/Utils/any.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/Gem/develop/include/Gem/Utils/any.h b/Gem/develop/include/Gem/Utils/any.h
index 4ce48b0..5841c79 100644
--- a/Gem/develop/include/Gem/Utils/any.h
+++ b/Gem/develop/include/Gem/Utils/any.h
@@ -70,11 +70,15 @@ struct fxns {
struct type {
static const std::type_info& get_type(void)
{
+#if 0
const std::type_info&res=typeid(T);
// the following is a dummy use of the type_info struct
// to make the template engine work properly on OSX/10.9
static std::string _ = res.name();
return res;
+#else
+ return typeid(T);
+#endif
}
static void static_delete(void** x)
{
@@ -100,8 +104,12 @@ struct fxns<false> {
struct type {
static const std::type_info& get_type(void)
{
+#if 0
const std::type_info&res=typeid(T);
return res;
+#else
+ return typeid(T);
+#endif
}
static void static_delete(void** x)
{