Blob Blame Raw
diff -up ParaView-v5.0.0-RC3-source/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx.jsoncpp ParaView-v5.0.0-RC3-source/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx
--- ParaView-v5.0.0-RC3-source/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx.jsoncpp	2015-12-22 18:14:02.000000000 -0700
+++ ParaView-v5.0.0-RC3-source/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx	2016-01-06 08:55:57.932760040 -0700
@@ -112,7 +112,7 @@ public:
   //----------------------------------------------------------------------------
   // Description: Get a Json::Value given a setting name. Returns the
   // highest-priority setting defined in the setting collections, and
-  // null if it isn't defined in any of the collections.
+  // nullRef if it isn't defined in any of the collections.
   //
   // String format is:
   // "." => root node
@@ -509,8 +509,8 @@ public:
       {
       if (jsonValue.isArray())
         {
-        // Reset to null so that we aren't setting a value on a Json::Value array
-        jsonValue = Json::Value::null;
+        // Reset to nullRef so that we aren't setting a value on a Json::Value array
+        jsonValue = Json::Value::nullRef;
         this->Modified();
         }
 
@@ -524,8 +524,8 @@ public:
       {
       if (!jsonValue.isArray() && !jsonValue.isNull())
         {
-        // Reset to null so that the jsonValue.resize() operation works
-        jsonValue = Json::Value::null;
+        // Reset to nullRef so that the jsonValue.resize() operation works
+        jsonValue = Json::Value::nullRef;
         this->Modified();
         }
 
@@ -553,8 +553,8 @@ public:
       {
       if (jsonValue.isArray())
         {
-        // Reset to null so that we aren't setting a value on a Json::Value array
-        jsonValue = Json::Value::null;
+        // Reset to nullRef so that we aren't setting a value on a Json::Value array
+        jsonValue = Json::Value::nullRef;
         this->Modified();
         }
 
@@ -568,8 +568,8 @@ public:
       {
       if (!jsonValue.isArray() && !jsonValue.isNull())
         {
-        // Reset to null so that the jsonValue.resize() operation works
-        jsonValue = Json::Value::null;
+        // Reset to nullRef so that the jsonValue.resize() operation works
+        jsonValue = Json::Value::nullRef;
         this->Modified();
         }
 
@@ -597,8 +597,8 @@ public:
       {
       if (jsonValue.isArray())
         {
-        // Reset to null so that we aren't setting a value on a Json::Value array
-        jsonValue = Json::Value::null;
+        // Reset to nullRef so that we aren't setting a value on a Json::Value array
+        jsonValue = Json::Value::nullRef;
         this->Modified();
         }
 
@@ -612,8 +612,8 @@ public:
       {
       if (!jsonValue.isArray() && !jsonValue.isNull())
         {
-        // Reset to null so that the jsonValue.resize() operation works
-        jsonValue = Json::Value::null;
+        // Reset to nullRef so that the jsonValue.resize() operation works
+        jsonValue = Json::Value::nullRef;
         this->Modified();
         }