From cb3770a9aecbf19f1c753a592ad43cf61c2ebf08 Mon Sep 17 00:00:00 2001 From: a-brandt Date: Thu, 20 Sep 2012 10:13:08 +0200 Subject: [PATCH] Change to work with ICU 48 --- lib/Basics/Utf8Helper.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Basics/Utf8Helper.cpp b/lib/Basics/Utf8Helper.cpp index 4f4c441b92..291f1486e4 100644 --- a/lib/Basics/Utf8Helper.cpp +++ b/lib/Basics/Utf8Helper.cpp @@ -29,7 +29,7 @@ #include "Utf8Helper.h" #ifdef TRI_HAVE_ICU -#include "BasicsC/utf8-helper.h" +#include "unicode/normalizer2.h" #else #include "string.h" #endif @@ -160,7 +160,7 @@ v8::Handle Utf8Helper::normalize (v8::Handle obj) { if (str_len > 0) { #ifdef TRI_HAVE_ICU UErrorCode erroCode = U_ZERO_ERROR; - const Normalizer2* normalizer = Normalizer2::getNFCInstance(erroCode); + const Normalizer2* normalizer = Normalizer2::getInstance(NULL, "nfc", UNORM2_COMPOSE ,erroCode); if (U_FAILURE(erroCode)) { LOGGER_ERROR << "error in Normalizer2::getNFCInstance(erroCode): " << u_errorName(erroCode);