3party/jsoncpp
0
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2024-12-27 11:21:02 +08:00
Code Issues Projects Releases Wiki Activity

stop computing strlen() in CZString

Browse Source
This commit is contained in:
Christopher Dunn 2015-03-02 12:23:03 -06:00
parent 8a77037320
commit e6b46e4503
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib_json/json_value.cpp
View File

@ -197,8 +197,8 @@ bool Value::CZString::operator<(const CZString& other) const {
if (!cstr_) return index_ < other.index_; if (!cstr_) return index_ < other.index_;
//return strcmp(cstr_, other.cstr_) < 0; //return strcmp(cstr_, other.cstr_) < 0;
// Assume both are strings. // Assume both are strings.
unsigned this_len = strlen(this->cstr_); unsigned this_len = this->storage_.length_;
unsigned other_len = strlen(other.cstr_); unsigned other_len = other.storage_.length_;
unsigned min_len = std::min(this_len, other_len); unsigned min_len = std::min(this_len, other_len);
int comp = memcmp(this->cstr_, other.cstr_, min_len); int comp = memcmp(this->cstr_, other.cstr_, min_len);
if (comp < 0) return true; if (comp < 0) return true;
@ -210,8 +210,8 @@ bool Value::CZString::operator==(const CZString& other) const {
if (!cstr_) return index_ == other.index_; if (!cstr_) return index_ == other.index_;
//return strcmp(cstr_, other.cstr_) == 0; //return strcmp(cstr_, other.cstr_) == 0;
// Assume both are strings. // Assume both are strings.
unsigned this_len = strlen(this->cstr_); unsigned this_len = this->storage_.length_;
unsigned other_len = strlen(other.cstr_); unsigned other_len = other.storage_.length_;
if (this_len != other_len) return false; if (this_len != other_len) return false;
int comp = memcmp(this->cstr_, other.cstr_, this_len); int comp = memcmp(this->cstr_, other.cstr_, this_len);
return comp == 0; return comp == 0;