diff options
Diffstat (limited to 'Build/source/libs/teckit/TLpatches/patch-03-warnings')
-rw-r--r-- | Build/source/libs/teckit/TLpatches/patch-03-warnings | 77 |
1 files changed, 12 insertions, 65 deletions
diff --git a/Build/source/libs/teckit/TLpatches/patch-03-warnings b/Build/source/libs/teckit/TLpatches/patch-03-warnings index 011670adda3..eb36b57ca5b 100644 --- a/Build/source/libs/teckit/TLpatches/patch-03-warnings +++ b/Build/source/libs/teckit/TLpatches/patch-03-warnings @@ -1,9 +1,9 @@ Avoid more compiler warnings. -diff -ur teckit-2.5.8/source/Compiler.cpp teckit-src/source/Compiler.cpp ---- teckit-2.5.8/source/Compiler.cpp Tue Dec 05 07:20:20 2017 -+++ teckit-src/source/Compiler.cpp Tue Jul 24 07:23:53 2018 -@@ -189,14 +189,14 @@ +diff -ur teckit-2.5.9/source/Compiler.cpp teckit-src/source/Compiler.cpp +--- teckit-2.5.9/source/Compiler.cpp Tue Mar 19 00:23:12 2019 ++++ teckit-src/source/Compiler.cpp Tue Mar 19 07:06:23 2019 +@@ -189,7 +189,7 @@ free(table); } @@ -12,63 +12,11 @@ diff -ur teckit-2.5.8/source/Compiler.cpp teckit-src/source/Compiler.cpp WINAPI TECkit_GetUnicodeName(UInt32 usv) { - const CharName *c = &gUnicodeNames[0]; - while (c->name != 0) - if (c->usv == usv) -- return (char*)c->name; -+ return c->name; - else - ++c; - return NULL; -@@ -2133,7 +2133,7 @@ - cout << " at line " << line << endl; - } - else -- (*errorFunction)(errFuncUserData, (char*)msg, (char*)s, line); -+ (*errorFunction)(errFuncUserData, msg, s, line); - errorState = true; - ++errorCount; - } - -diff -ur teckit-2.5.8/source/Engine.cpp teckit-src/source/Engine.cpp ---- teckit-2.5.8/source/Engine.cpp Tue Dec 05 07:20:20 2017 -+++ teckit-src/source/Engine.cpp Tue Jul 24 07:39:17 2018 -@@ -1093,7 +1075,7 @@ - if (matchElems == 0 && allowInsertion == false) - continue; - patternLength = matchElems + READ(rule->postLength); -- pattern = (MatchElem*)(rule + 1); // point past the defined struct for the rule header -+ pattern = (const MatchElem*)(rule + 1); // point past the defined struct for the rule header - direction = 1; - infoLimit = matchElems; - -@@ -2194,7 +2168,7 @@ - status = kStatus_BadMappingVersion; - else { - const Byte* namePtr; -- if (getNamePtrFromTable((Byte*)fh, nameID, namePtr, *nameLength)) { -+ if (getNamePtrFromTable((const Byte*)fh, nameID, namePtr, *nameLength)) { - UInt16 copyBytes = *nameLength < bufferSize ? *nameLength : bufferSize; - if (copyBytes > 0) - memcpy(nameBuffer, namePtr, copyBytes); -diff -ur teckit-2.5.8/source/Engine.h teckit-src/source/Engine.h ---- teckit-2.5.8/source/Engine.h Tue Dec 05 07:20:20 2017 -+++ teckit-src/source/Engine.h Tue Jul 24 07:29:14 2018 -@@ -117,7 +117,7 @@ - - UInt32 match(int index, int repeats, int textLoc); - // returns 0 for no match, 1 for match, or kNeedMoreInput/kInvalidChar -- MatchElem* pattern; -+ const MatchElem* pattern; - int patternLength; - int direction; - MatchInfo info[256]; - -diff -ur teckit-2.5.8/source/Public-headers/TECkit_Compiler.h teckit-src/source/Public-headers/TECkit_Compiler.h ---- teckit-2.5.8/source/Public-headers/TECkit_Compiler.h Tue Dec 05 07:20:20 2017 -+++ teckit-src/source/Public-headers/TECkit_Compiler.h Tue Jul 24 07:41:00 2018 -@@ -56,7 +59,7 @@ +diff -ur teckit-2.5.9/source/Public-headers/TECkit_Compiler.h teckit-src/source/Public-headers/TECkit_Compiler.h +--- teckit-2.5.9/source/Public-headers/TECkit_Compiler.h Tue Mar 19 00:23:12 2019 ++++ teckit-src/source/Public-headers/TECkit_Compiler.h Tue Mar 19 07:31:10 2019 +@@ -55,7 +58,7 @@ #define kCompilerOpts_Compress 0x00000010 /* generate compressed mapping table */ #define kCompilerOpts_XML 0x00000020 /* instead of a compiled binary table, generate an XML representation of the mapping */ @@ -77,7 +25,7 @@ diff -ur teckit-2.5.8/source/Public-headers/TECkit_Compiler.h teckit-src/source/ TECkit_Status WINAPI EXPORTED -@@ -75,7 +78,7 @@ +@@ -74,7 +77,7 @@ TECkit_GetCompilerVersion(); /* new APIs for looking up Unicode names (as NUL-terminated C strings) */ @@ -87,10 +35,9 @@ diff -ur teckit-2.5.8/source/Public-headers/TECkit_Compiler.h teckit-src/source/ TECkit_GetUnicodeName(UInt32 usv); /* returns the Unicode name of usv, if available, else NULL */ - -diff -ur teckit-2.5.8/source/Sample-tools/TECkit_Compile.cpp teckit-src/source/Sample-tools/TECkit_Compile.cpp ---- teckit-2.5.8/source/Sample-tools/TECkit_Compile.cpp Tue Dec 05 07:20:20 2017 -+++ teckit-src/source/Sample-tools/TECkit_Compile.cpp Tue Jul 24 07:34:18 2018 +diff -ur teckit-2.5.9/source/Sample-tools/TECkit_Compile.cpp teckit-src/source/Sample-tools/TECkit_Compile.cpp +--- teckit-2.5.9/source/Sample-tools/TECkit_Compile.cpp Tue Mar 19 00:23:12 2019 ++++ teckit-src/source/Sample-tools/TECkit_Compile.cpp Tue Mar 19 07:25:19 2019 @@ -24,13 +24,13 @@ #endif |