sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use U_NAMESPACE_QUALIFIER to most cleanly support when icu is built with -DU_USING_ICU_NAMESPACE=0 - refs #1985

Browse source
This commit is contained in:
Dane Springmeyer 2013-08-14 21:56:40 -04:00
parent a13fe7da06
commit 5667343ad9
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SConstruct
View file

@ -926,7 +926,7 @@ def boost_regex_has_icu(context):
int main() int main()
{ {
icu::UnicodeString ustr; U_NAMESPACE_QUALIFIER UnicodeString ustr;
try { try {
boost::u32regex pattern = boost::make_u32regex(ustr); boost::u32regex pattern = boost::make_u32regex(ustr);
} }

2
include/mapnik/value_types.hpp
View file

@ -42,7 +42,7 @@ typedef int value_integer;
#endif #endif
typedef double value_double; typedef double value_double;
typedef icu::UnicodeString value_unicode_string; typedef U_NAMESPACE_QUALIFIER UnicodeString value_unicode_string;
typedef bool value_bool; typedef bool value_bool;
struct value_null struct value_null

2
src/font_engine_freetype.cpp
View file

@ -376,7 +376,7 @@ void font_face_set::get_string_info(string_info & info, mapnik::value_unicode_st
shaped.releaseBuffer(length); shaped.releaseBuffer(length);
if (U_SUCCESS(err)) { if (U_SUCCESS(err)) {
icu::StringCharacterIterator iter(shaped); U_NAMESPACE_QUALIFIER StringCharacterIterator iter(shaped);
for (iter.setToStart(); iter.hasNext();) { for (iter.setToStart(); iter.hasNext();) {
UChar ch = iter.nextPostInc(); UChar ch = iter.nextPostInc();
char_info char_dim = character_dimensions(ch); char_info char_dim = character_dimensions(ch);