Skip to content

Commit 80524fd

Browse files
committed
avoid compiler warning
..\PythonScript\PythonScript\src\UTF8Iterator.cpp(13,39): Siehe Deklaration von "string_type" ..\PythonScript\boost\boost\regex\v5\primary_transform.hpp(59,41):
1 parent 040af2c commit 80524fd

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

PythonScript/src/UTF8Iterator.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ void UTF8Iterator::readCharacter()
1010
}
1111

1212
typedef u32_regex_traits::charT charT;
13-
typedef u32_regex_traits::string_type string_type;
13+
typedef u32_regex_traits::string_type regex_string_type;
1414
typedef u32_regex_traits::char_class_type char_class_type;
1515

1616
char_class_type u32_regex_traits::lookup_classname(const charT* p1, const charT* p2) {
@@ -53,7 +53,7 @@ char_class_type u32_regex_traits::lookup_classname(const charT* p1, const charT*
5353
return 0;
5454
}
5555

56-
string_type u32_regex_traits::lookup_collatename(const charT* p1, const charT* p2) {
56+
regex_string_type u32_regex_traits::lookup_collatename(const charT* p1, const charT* p2) {
5757
u8string name = UtfConversion::toUtf8(ConstString<charT>(p1, p2-p1));
5858
u8string result = boost::BOOST_REGEX_DETAIL_NS::lookup_default_collate_name(name);
5959
return UtfConversion::toUtf32(result);
@@ -66,7 +66,7 @@ charT u32_regex_traits::mapChar(charT c, DWORD mapFlags) {
6666
return UtfConversion::toUtf32(u16mapped);
6767
}
6868

69-
string_type u32_regex_traits::genSortkey(const charT* p1, const charT* p2, bool onlyPrimaryLevel) {
69+
regex_string_type u32_regex_traits::genSortkey(const charT* p1, const charT* p2, bool onlyPrimaryLevel) {
7070
std::wstring str = UtfConversion::toUtf16(ConstString<charT>(p1, p2-p1));
7171
std::basic_string<UCHAR> sortkey = genSortkey(str, onlyPrimaryLevel);
7272
return convertSortkeyToInts(sortkey);
@@ -94,9 +94,9 @@ std::basic_string<UCHAR> u32_regex_traits::genSortkey(const std::wstring& wstr,
9494
sortkey.resize(sortkey_byte_length);
9595
return sortkey;
9696
}
97-
string_type u32_regex_traits::convertSortkeyToInts(const std::basic_string<UCHAR>& sortkey) {
97+
regex_string_type u32_regex_traits::convertSortkeyToInts(const std::basic_string<UCHAR>& sortkey) {
9898
size_t length_as_ints = (sortkey.length()+2) / 3; // We store 3 bytes per int, to be certain we do not generate a negative int.
99-
string_type sortkey_ints;
99+
regex_string_type sortkey_ints;
100100
sortkey_ints.reserve(length_as_ints);
101101
size_t i = 0;
102102
for (i = 3; i < sortkey.length(); i += 3)

0 commit comments

Comments
 (0)