Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mini changes

This commit is contained in:
Jan Steemann 2012-12-06 13:12:49 +01:00
parent 242a16d6f5
commit b8fc158e77
3 changed files with 6 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/Basics/Utf8Helper.cpp
View File

@ -31,6 +31,7 @@
#ifdef TRI_HAVE_ICU
#include "unicode/normalizer2.h"
#include "unicode/ucasemap.h"
#include "unicode/brkiter.h"
#else
#include "string.h"
#endif
@ -67,39 +68,6 @@ Utf8Helper::~Utf8Helper () {
}
}
/*
int Utf8Helper::compareUtf8 (const char* left, size_t leftLength, const char* right, size_t rightLength) {
#ifdef TRI_HAVE_ICU
if (!_coll) {
LOGGER_ERROR << "no Collator in Utf8Helper::compareUtf8()!";
return 0;
}
UErrorCode status = U_ZERO_ERROR;
int result = _coll->compareUTF8(StringPiece(left, leftLength), StringPiece(right, rightLength), status);
if(U_FAILURE(status)) {
LOGGER_ERROR << "error in Collator::compareUTF8(...): " << u_errorName(status);
return 0;
}
return result;
#else
if (leftLength == rightLength) {
return memcmp((const void*)left, (const void*)right, leftLength);
}
int result = memcmp((const void*)left, (const void*)right, leftLength < rightLength ? leftLength : rightLength);
if (result == 0) {
if (leftLength < rightLength) {
return -1;
}
return 1;
}
return result;
#endif
}
*/
int Utf8Helper::compareUtf8 (const char* left, const char* right) {
#ifdef TRI_HAVE_ICU
if (!_coll) {

1
lib/Basics/Utf8Helper.h
View File

@ -55,6 +55,7 @@ namespace triagens {
////////////////////////////////////////////////////////////////////////////////
/// @brief a default helper
////////////////////////////////////////////////////////////////////////////////
static Utf8Helper DefaultUtf8Helper;
public: