commit 3b0a30d6e71f6d9c1a123f3f3c72056dedda789f
author Jeff Genovy <29107334+jefgen@users.noreply.github.com> Wed Jun 27 19:02:09 2018 +0000
committer Jeff Genovy <29107334+jefgen@users.noreply.github.com> Wed Jun 27 19:02:09 2018 +0000
tree c4b0304d9743d3a6d6ccf13a7ea5ccacbaa2d068
parent 99354ec034118302514773e3b17d01b68e021eb2

ICU-13814 Visual Studio IntelliSense should ignore the 'urename.h' content so that 'Go-to-Definition' (F12) will actually work in the IDE.

X-SVN-Rev: 41551

icu4c/source/common/unicode/urename.h

diff --git a/icu4c/source/common/unicode/urename.h b/icu4c/source/common/unicode/urename.h
index 4175e52..523fcc1 100644
--- a/icu4c/source/common/unicode/urename.h
+++ b/icu4c/source/common/unicode/urename.h
@@ -33,6 +33,9 @@
 
 #if !U_DISABLE_RENAMING
 
+// Disable Renaming for Visual Studio's IntelliSense feature, so that 'Go-to-Definition' (F12) will work.
+#if defined(_MSC_VER) && defined(__INTELLISENSE__)
+
 /* We need the U_ICU_ENTRY_POINT_RENAME definition. There's a default one in unicode/uvernum.h we can use, but we will give
    the platform a chance to define it first.
    Normally (if utypes.h or umachine.h was included first) this will not be necessary as it will already be defined.
@@ -1827,6 +1830,8 @@
 #define ztrans_setTime U_ICU_ENTRY_POINT_RENAME(ztrans_setTime)
 #define ztrans_setTo U_ICU_ENTRY_POINT_RENAME(ztrans_setTo)
 
-#endif
+#endif /* defined(_MSC_VER) && defined(__INTELLISENSE__) */
 
-#endif
+#endif /* U_DISABLE_RENAMING */
+
+#endif /* URENAME_H */

icu4c/source/tools/genren/genren.pl

diff --git a/icu4c/source/tools/genren/genren.pl b/icu4c/source/tools/genren/genren.pl
index 8859a27..d9a6d88 100755
--- a/icu4c/source/tools/genren/genren.pl
+++ b/icu4c/source/tools/genren/genren.pl
@@ -106,6 +106,9 @@
 
 #if !U_DISABLE_RENAMING
 
+// Disable Renaming for Visual Studio's IntelliSense feature, so that 'Go-to-Definition' (F12) will work.
+#if defined(_MSC_VER) && defined(__INTELLISENSE__)
+
 /* We need the U_ICU_ENTRY_POINT_RENAME definition. There's a default one in unicode/uvernum.h we can use, but we will give
    the platform a chance to define it first.
    Normally (if utypes.h or umachine.h was included first) this will not be necessary as it will already be defined.
@@ -236,8 +239,15 @@
 #    print HEADER "#define $_ $_$U_ICU_VERSION_SUFFIX\n";
 }
 
-print HEADER "\n#endif\n";
-print HEADER "\n#endif\n";
+
+print HEADER <<"EndOfHeaderFooter";
+
+#endif /* defined(_MSC_VER) && defined(__INTELLISENSE__) */
+#endif /* U_DISABLE_RENAMING */
+#endif /* URENAME_H */
+
+EndOfHeaderFooter
+
 
 close HEADER;