generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-05-21 20:26:35 +02:00
Code Issues Projects Releases Wiki Activity

Rename variable empty to emptyString

Browse Source 
Rename variable empty to emptyString in Value constructor to avoid shadowing of Value::empty().

GCC 4.8 produces the warning about this:
lib_json/json_value.cpp: In constructor ‘Json::Value::Value(Json::ValueType)’:
lib_json/json_value.cpp:346:27: warning: declaration of ‘empty’ shadows a member of 'this' [-Wshadow]
This commit is contained in:
Paweł Bylica 2016-10-14 11:59:28 +02:00 committed by GitHub
parent d8cd848ede
commit 1572539bec
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib_json/json_value.cpp
View File

@ -343,7 +343,7 @@ bool Value::CZString::isStaticString() const { return storage_.policy_ == noDupl
* This optimization is used in ValueInternalMap fast allocator. * This optimization is used in ValueInternalMap fast allocator.
*/ */
Value::Value(ValueType vtype) { Value::Value(ValueType vtype) {
static char const empty[] = ""; static char const emptyString[] = "";
initBasic(vtype); initBasic(vtype);
switch (vtype) { switch (vtype) {
case nullValue: case nullValue:
@ -357,7 +357,7 @@ Value::Value(ValueType vtype) {
break; break;
case stringValue: case stringValue:
// allocated_ == false, so this is safe. // allocated_ == false, so this is safe.
value_.string_ = const_cast<char*>(static_cast<char const*>(empty)); value_.string_ = const_cast<char*>(static_cast<char const*>(emptyString));
break; break;
case arrayValue: case arrayValue:
case objectValue: case objectValue: