SWDEV-463865 - namespace changes to prevent symbol conflicts in static builds

Change-Id: I09ceb5962b7aa19156909f47167c87d6887c9cd1


[ROCm/clr commit: 3edf1501cc]

projects/clr/rocclr/utils/flags.cpp

@@ -204,6 +204,9 @@ Flag Flag::flags_[] = {
 
 }  // namespace amd
 
+#ifndef _WIN32
+namespace {
+#endif
 #define DEFINE_RELEASE_FLAG_VALUE(type, name, value, help) type name = value;
 #define DEFINE_DEBUG_FLAG_VALUE(type, name, value, help) DEBUG_ONLY(type name = value);
 
@@ -211,3 +214,6 @@ RUNTIME_FLAGS(DEFINE_DEBUG_FLAG_VALUE, DEFINE_RELEASE_FLAG_VALUE, DEFINE_DEBUG_F
 
 #undef DEFINE_DEBUG_FLAG_VALUE
 #undef DEFINE_RELEASE_FLAG_VALUE
+#ifndef _WIN32
+}
+#endif

projects/clr/rocclr/utils/flags.hpp

@@ -328,7 +328,12 @@ struct Flag {
 #ifdef _WIN32
 # define EXPORT_FLAG extern "C" __declspec(dllexport)
 #else // !_WIN32
+#ifdef BUILD_STATIC_LIBS
+# define EXPORT_FLAG extern
+#else
 # define EXPORT_FLAG extern "C"
+#endif
+namespace {
 #endif // !_WIN32
 
 #define DECLARE_RELEASE_FLAG(type, name, value, help) EXPORT_FLAG type name;
@@ -342,5 +347,7 @@ RUNTIME_FLAGS(DECLARE_DEBUG_FLAG, DECLARE_RELEASE_FLAG, DECLARE_DEBUG_FLAG);
 
 #undef DECLARE_DEBUG_FLAG
 #undef DECLARE_RELEASE_FLAG
-
+#ifndef _WIN32
+}
+#endif // !_WIN32
 #endif /*FLAGS_HPP_*/