From: Andy Heninger <andy.heninger@gmail.com>
Date: Thu, 30 Nov 2017 23:19:14 +0000 (+0000)
Subject: ICU-12711 Default U_USING_ICU_NAMESPACE to 0 when building ICU library code.
X-Git-Tag: release-61-rc~179
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ec1aa972e22ba9c3df3af10b2f0a832b299e758;p=icu

ICU-12711 Default U_USING_ICU_NAMESPACE to 0 when building ICU library code.

X-SVN-Rev: 40679
---

diff --git a/icu4c/source/common/unicode/uversion.h b/icu4c/source/common/unicode/uversion.h
index e24068d0f95..0d5152e2730 100644
--- a/icu4c/source/common/unicode/uversion.h
+++ b/icu4c/source/common/unicode/uversion.h
@@ -105,7 +105,7 @@ typedef uint8_t UVersionInfo[U_MAX_VERSION_LENGTH];
  * @stable ICU 2.4
  */
 
-/* Define namespace symbols if the compiler supports it. */
+/* Define C++ namespace symbols. */
 #ifdef __cplusplus
 #   if U_DISABLE_RENAMING
 #       define U_ICU_NAMESPACE icu
@@ -122,7 +122,13 @@ typedef uint8_t UVersionInfo[U_MAX_VERSION_LENGTH];
 #   define U_NAMESPACE_QUALIFIER U_ICU_NAMESPACE::
 
 #   ifndef U_USING_ICU_NAMESPACE
-#       define U_USING_ICU_NAMESPACE 1
+#       if defined(U_COMBINED_IMPLEMENTATION) || defined(U_COMMON_IMPLEMENTATION) || \
+                defined(U_I18N_IMPLEMENTATION) || defined(U_IO_IMPLEMENTATION) || \
+                defined(U_LAYOUTEX_IMPLEMENTATION) || defined(U_TOOLUTIL_IMPLEMENTATION)
+#           define U_USING_ICU_NAMESPACE 0
+#       else
+#           define U_USING_ICU_NAMESPACE 1
+#       endif
 #   endif
 #   if U_USING_ICU_NAMESPACE
         U_NAMESPACE_USE