ICU-20566 Add missing ICU namespace macros for extra files

ICU now uses namespaces. When trying to use the scrptrun.h header, the
header cannot compile stand-alone as it is inheriting from UObject which
is namespaced now. Add namespace macros to properly inherit.

ICU-20566 Add scrptrun to the extra high level Makefile

The scrptrun project was not being added to the extra portion of the ICU
build. Add it as a sub project so it can always be built.

ICU-20566 Properly namespace the ScriptRun test

The ScriptRun class is now namespaced.  Update the test reference.

ICU-20566 Use int instead of void to compile

Clang will complain about having a void main without an int main to
invoke. Change void to int and return 0.

diff --git a/icu4c/source/extra/Makefile.in b/icu4c/source/extra/Makefile.in
index 4dd2818bdb9a4020168d2da26c6bee11f3623f9b..2e48dba73d78201c35c83bc5cc8216dc0371fcd0 100644 (file)
--- a/icu4c/source/extra/Makefile.in
+++ b/icu4c/source/extra/Makefile.in
@@ -23,7 +23,7 @@ subdir = extra
 ## Files to remove for 'make clean'
 CLEANFILES = *~
 
-SUBDIRS = uconv
+SUBDIRS = scrptrun uconv
 
 ## List of phony targets
 .PHONY : all all-local all-recursive install install-local             \

diff --git a/icu4c/source/extra/scrptrun/scrptrun.cpp b/icu4c/source/extra/scrptrun/scrptrun.cpp
index d36ec614c4616185e27ae240114b11abdb74ff0f..0a438c316a686bf5a5ac6af2af041ce9f94b50a4 100644 (file)
--- a/icu4c/source/extra/scrptrun/scrptrun.cpp
+++ b/icu4c/source/extra/scrptrun/scrptrun.cpp
@@ -19,6 +19,8 @@
 #include "cmemory.h"
 #include "scrptrun.h"
 
+U_NAMESPACE_BEGIN
+
 const char ScriptRun::fgClassID=0;
 
 UChar32 ScriptRun::pairedChars[] = {
@@ -201,3 +203,4 @@ UBool ScriptRun::next()
     return true;
 }
 
+U_NAMESPACE_END

diff --git a/icu4c/source/extra/scrptrun/scrptrun.h b/icu4c/source/extra/scrptrun/scrptrun.h
index 0ef5df24bbf7adbde5ad0ad0830e596356defdff..ac6bfe327e857fcf5a58beaf94e1630f6b8cae29 100644 (file)
--- a/icu4c/source/extra/scrptrun/scrptrun.h
+++ b/icu4c/source/extra/scrptrun/scrptrun.h
@@ -20,6 +20,8 @@
 #include "unicode/uobject.h"
 #include "unicode/uscript.h"
 
+U_NAMESPACE_BEGIN
+
 struct ScriptRecord
 {
     UChar32 startChar;
@@ -152,5 +154,6 @@ inline void ScriptRun::reset(const UChar chars[], int32_t start, int32_t length)
     reset(start, length);
 }
 
+U_NAMESPACE_END
 
 #endif

diff --git a/icu4c/source/extra/scrptrun/srtest.cpp b/icu4c/source/extra/scrptrun/srtest.cpp
index 5792071ff0fa17b3b66ba3cdeb05d8f9a5aceec1..8d59fb9ef6a0911f595189b5732182ccd90c5d70 100644 (file)
--- a/icu4c/source/extra/scrptrun/srtest.cpp
+++ b/icu4c/source/extra/scrptrun/srtest.cpp
@@ -27,9 +27,9 @@ UChar testChars[] = {
 
 int32_t testLength = UPRV_LENGTHOF(testChars);
 
-void main()
+int main()
 {
-    ScriptRun scriptRun(testChars, 0, testLength);
+    icu::ScriptRun scriptRun(testChars, 0, testLength);
 
     while (scriptRun.next()) {
         int32_t     start = scriptRun.getScriptStart();
@@ -38,4 +38,5 @@ void main()
 
         printf("Script '%s' from %d to %d.\n", uscript_getName(code), start, end);
     }
+    return 0;
 }