From 28e36045ae103ce5a2cfaa73043fddeec4148107 Mon Sep 17 00:00:00 2001
From: Oren <oren_segal@student.uml.edu>
Date: Thu, 23 Jul 2015 01:38:30 -0400
Subject: [PATCH] fix default name str bug -> Stringification of define needs
two stages
---
.../com.amd.aparapi.jni/src/cpp/runKernel/ConfigSettings.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/aparapi/com.amd.aparapi.jni/src/cpp/runKernel/ConfigSettings.h b/src/aparapi/com.amd.aparapi.jni/src/cpp/runKernel/ConfigSettings.h
index 41260ed4..2c87a67e 100644
--- a/src/aparapi/com.amd.aparapi.jni/src/cpp/runKernel/ConfigSettings.h
+++ b/src/aparapi/com.amd.aparapi.jni/src/cpp/runKernel/ConfigSettings.h
@@ -155,9 +155,11 @@ public:
#define DEFAULT_PLATFORM_CONFIG_NAME DEFAULT_PCN
#define NAME_TO_STR(s) #s
+#define DEFINE_NAME_TO_STR(s) NAME_TO_STR(s)
PlatformConfig::Ptr findPlatformConfigByName(const char *name)
{
+ printf("findPlatformConfigByName: %s\n",name);
PlatformConfigMap::iterator itr = m_platformConfigMap.find(name);
if (itr != m_platformConfigMap.end())
{
@@ -170,6 +172,7 @@ public:
PlatformConfig::Ptr findPlatformConfigFromFullName(const char *fullPlatformName)
{
+ printf("findPlatformConfigFromFullName: %s\n",fullPlatformName);
// Requires C++11 -> leave minimum compiler support at C++0x for now ...
//for ( const auto &itr : m_platformConfigMap )
for (PlatformConfigMap::iterator itr = m_platformConfigMap.begin(); itr != m_platformConfigMap.end(); itr++ )
@@ -179,7 +182,7 @@ public:
}
// if not found search for default cplatform config
- return findPlatformConfigByName(NAME_TO_STR(DEFAULT_PLATFORM_CONFIG_NAME));
+ return findPlatformConfigByName(DEFINE_NAME_TO_STR(DEFAULT_PLATFORM_CONFIG_NAME));
}
PlatformConfigMap &getConfigMap()
--
GitLab