pyrox.dev
1--- a/src/shared/CLucene/config/repl_tchar.h
2+++ b/src/shared/CLucene/config/repl_tchar.h
3@@ -28,26 +28,26 @@
4 #define _istdigit iswdigit //* digit char check
5 #define _totlower towlower //* convert char to lower case
6 #define _totupper towupper //* convert char to lower case
7- #define _tcslwr wcslwr //* convert string to lower case
8+ #define _tcslwr std::wcslwr //* convert string to lower case
9
10 //these are the string handling functions
11 //we may need to create wide-character/multi-byte replacements for these
12- #define _tcscpy wcscpy //copy a string to another string
13- #define _tcsncpy wcsncpy //copy a specified amount of one string to another string.
14- #define _tcscat wcscat //copy a string onto the end of the other string
15- #define _tcsncat wcsncat
16- #define _tcschr wcschr //find location of one character
17- #define _tcsstr wcsstr //find location of a string
18- #define _tcslen wcslen //get length of a string
19- #define _tcscmp wcscmp //case sensitive compare two strings
20- #define _tcsncmp wcsncmp //case sensitive compare two strings
21- #define _tcscspn wcscspn //location of any of a set of character in a string
22+ #define _tcscpy std::wcscpy //copy a string to another string
23+ #define _tcsncpy std::wcsncpy //copy a specified amount of one string to another string.
24+ #define _tcscat std::wcscat //copy a string onto the end of the other string
25+ #define _tcsncat std::wcsncat
26+ #define _tcschr std::wcschr //find location of one character
27+ #define _tcsstr std::wcsstr //find location of a string
28+ #define _tcslen std::wcslen //get length of a string
29+ #define _tcscmp std::wcscmp //case sensitive compare two strings
30+ #define _tcsncmp std::wcsncmp //case sensitive compare two strings
31+ #define _tcscspn std::wcscspn //location of any of a set of character in a string
32
33 //string compare
34 #ifdef _CL_HAVE_FUNCTION_WCSICMP
35- #define _tcsicmp wcsicmp //* case insensitive compare two string
36+ #define _tcsicmp std::wcsicmp //* case insensitive compare two string
37 #else
38- #define _tcsicmp wcscasecmp //* case insensitive compare two string
39+ #define _tcsicmp std::wcscasecmp //* case insensitive compare two string
40 #endif
41 #if defined(_CL_HAVE_FUNCTION_WCSDUP)
42 #define _tcsdup wcsdup
43@@ -56,8 +56,8 @@
44 #endif
45
46 //conversion functions
47- #define _tcstod wcstod //convert a string to a double
48- #define _tcstoi64 wcstoll //* convers a string to an 64bit bit integer
49+ #define _tcstod std::wcstod //convert a string to a double
50+ #define _tcstoi64 std::wcstoll //* convers a string to an 64bit bit integer
51 #define _itot _i64tot
52 #define _i64tot lltow //* converts a 64 bit integer to a string (with base)
53 #else //if defined(_ASCII)
54@@ -105,7 +105,7 @@
55 //some tchar headers miss these...
56 #ifndef _tcstoi64
57 #if defined(_UCS2)
58- #define _tcstoi64 wcstoll //* convers a string to an 64bit bit integer
59+ #define _tcstoi64 std::wcstoll //* convers a string to an 64bit bit integer
60 #else
61 #define _tcstoi64 strtoll
62 #endif