organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-05 05:25:34 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 11

ICU-20566 Add missing ICU namespace macros for extra files

Browse source 
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.
This commit is contained in:
Christian O. Venegas 2019-01-16 16:17:51 -08:00 • committed by Shane F. Carr
parent 2fa4c4d502
commit 7ccc8a09d6
4 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icu4c/source/extra/Makefile.in
View file

@ -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 \

3
icu4c/source/extra/scrptrun/scrptrun.cpp
View file

@ -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

3
icu4c/source/extra/scrptrun/scrptrun.h
View file

@ -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

5
icu4c/source/extra/scrptrun/srtest.cpp
View file

@ -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;
}