Create a local mod (based on jsoncpp trunk r248) to remove the static initialization caused by th...

Create a local mod (based on jsoncpp trunk r248) to remove the static initialization caused by the global variable Value::null.

BUG=109997
TEST=unittests

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=117516

[Ronghua Wu (Left Chromium), 2012-01-12 19:12:47]

Can't see the diff from rietveld, so attached diff here.

--- source/include/json/value.h	2012-01-12 10:40:55.397554807 -0800
+++ overrides/include/json/value.h	2012-01-12 10:54:08.191855825 -0800
@@ -7,7 +7,7 @@
 # define CPPTL_JSON_H_INCLUDED
 
 #if !defined(JSON_IS_AMALGAMATION)
-# include "forwards.h"
+# include "json/forwards.h"
 #endif // if !defined(JSON_IS_AMALGAMATION)
 # include <string>
 # include <vector>
@@ -136,7 +136,7 @@
       typedef Json::LargestUInt LargestUInt;
       typedef Json::ArrayIndex ArrayIndex;
 
-      static const Value null;
+      static const Value& null;
       /// Minimum signed integer value that can be stored in a Json::Value.
       static const LargestInt minLargestInt;
       /// Maximum signed integer value that can be stored in a Json::Value.



--- source/src/lib_json/json_value.cpp	2012-01-09 11:37:16.647016053 -0800
+++ overrides/src/lib_json/json_value.cpp	2012-01-12 10:58:40.636766291 -0800
@@ -26,7 +26,11 @@
 
 namespace Json {
 
-const Value Value::null;
+// This is a walkaround to avoid the static initialization by Value::null.
+// const Value Value::null;
+static const unsigned char kNull[sizeof(Value)] = { 0 };
+const Value& Value::null = reinterpret_cast<const Value&>(kNull);
+
 const Int Value::minInt = Int( ~(UInt(-1)/2) );
 const Int Value::maxInt = Int( UInt(-1)/2 );
 const UInt Value::maxUInt = UInt(-1);

[juberti1, 2012-01-12 19:24:23]

Since we pull in the source anyway, does it make sense to just make the change
on the actual source file?

http://codereview.chromium.org/9188042/diff/1/third_party/jsoncpp/jsoncpp.gyp
File third_party/jsoncpp/jsoncpp.gyp (right):

http://codereview.chromium.org/9188042/diff/1/third_party/jsoncpp/jsoncpp.gyp...
third_party/jsoncpp/jsoncpp.gyp:21: 'source/include/json/value.h',
does this need to use the override?

[Ronghua Wu (Left Chromium), 2012-01-12 19:33:10]

We don't have a copy of jsoncpp in chromium repo. The code is pulled in using
the DEPS.

http://codereview.chromium.org/9188042/diff/1/third_party/jsoncpp/jsoncpp.gyp
File third_party/jsoncpp/jsoncpp.gyp (right):

http://codereview.chromium.org/9188042/diff/1/third_party/jsoncpp/jsoncpp.gyp...
third_party/jsoncpp/jsoncpp.gyp:21: 'source/include/json/value.h',
On 2012/01/12 19:24:23, juberti1 wrote:
> does this need to use the override?

Yes, done.

[juberti1, 2012-01-12 19:38:56]

lgtm

[tommi (sloooow) - chröme, 2012-01-12 19:43:26]

lgtm

http://codereview.chromium.org/9188042/diff/5001/third_party/jsoncpp/override...
File third_party/jsoncpp/overrides/src/lib_json/json_value.cpp (right):

http://codereview.chromium.org/9188042/diff/5001/third_party/jsoncpp/override...
third_party/jsoncpp/overrides/src/lib_json/json_value.cpp:29: // This is a
walkaround to avoid the static initialization by Value::null.
nit:
// This is a workaround to avoid the static initialization of Value::null

[Ronghua Wu (Left Chromium), 2012-01-12 19:52:28]

http://codereview.chromium.org/9188042/diff/5001/third_party/jsoncpp/override...
File third_party/jsoncpp/overrides/src/lib_json/json_value.cpp (right):

http://codereview.chromium.org/9188042/diff/5001/third_party/jsoncpp/override...
third_party/jsoncpp/overrides/src/lib_json/json_value.cpp:29: // This is a
walkaround to avoid the static initialization by Value::null.
On 2012/01/12 19:43:27, tommi wrote:
> nit:
> // This is a workaround to avoid the static initialization of Value::null

Done.

[commit-bot: I haz the power, 2012-01-12 19:58:32]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ronghuawu@chromium.org/9188042/6002

[commit-bot: I haz the power, 2012-01-12 21:41:41]

Change committed as 117516