Blob Blame History Raw
diff -up ParaView-v4.4.0-source/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx.jsoncpp ParaView-v4.4.0-source/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx
--- ParaView-v4.4.0-source/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx.jsoncpp	2015-09-11 11:58:50.000000000 -0600
+++ ParaView-v4.4.0-source/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx	2015-09-19 13:16:36.369348728 -0600
@@ -146,7 +146,7 @@ public:
         }
       }
 
-    return Json::Value::null;
+    return Json::Value::nullRef;
   }
 
   //----------------------------------------------------------------------------
@@ -170,7 +170,7 @@ public:
         }
       }
 
-    return Json::Value::null;
+    return Json::Value::nullRef;
   }
 
   //----------------------------------------------------------------------------
@@ -473,7 +473,7 @@ public:
 
     Json::Path settingPath(root.c_str());
     Json::Value & jsonValue = settingPath.make(this->SettingCollections[0].Value);
-    jsonValue[leaf] = Json::Value::null;
+    jsonValue[leaf] = Json::Value::nullRef;
 
     if (values.size() > 1)
       {
@@ -510,7 +510,7 @@ public:
       if (jsonValue.isArray())
         {
         // Reset to null so that we aren't setting a value on a Json::Value array
-        jsonValue = Json::Value::null;
+        jsonValue = Json::Value::nullRef;
         this->Modified();
         }
 
@@ -525,7 +525,7 @@ public:
       if (!jsonValue.isArray() && !jsonValue.isNull())
         {
         // Reset to null so that the jsonValue.resize() operation works
-        jsonValue = Json::Value::null;
+        jsonValue = Json::Value::nullRef;
         this->Modified();
         }
 
@@ -554,7 +554,7 @@ public:
       if (jsonValue.isArray())
         {
         // Reset to null so that we aren't setting a value on a Json::Value array
-        jsonValue = Json::Value::null;
+        jsonValue = Json::Value::nullRef;
         this->Modified();
         }
 
@@ -569,7 +569,7 @@ public:
       if (!jsonValue.isArray() && !jsonValue.isNull())
         {
         // Reset to null so that the jsonValue.resize() operation works
-        jsonValue = Json::Value::null;
+        jsonValue = Json::Value::nullRef;
         this->Modified();
         }
 
@@ -598,7 +598,7 @@ public:
       if (jsonValue.isArray())
         {
         // Reset to null so that we aren't setting a value on a Json::Value array
-        jsonValue = Json::Value::null;
+        jsonValue = Json::Value::nullRef;
         this->Modified();
         }
 
@@ -613,7 +613,7 @@ public:
       if (!jsonValue.isArray() && !jsonValue.isNull())
         {
         // Reset to null so that the jsonValue.resize() operation works
-        jsonValue = Json::Value::null;
+        jsonValue = Json::Value::nullRef;
         this->Modified();
         }
 
diff -up ParaView-v4.4.0-source/ParaViewCore/VTKExtensions/CosmoTools/vtkPMultiResolutionGenericIOReader.cxx.jsoncpp ParaView-v4.4.0-source/ParaViewCore/VTKExtensions/CosmoTools/vtkPMultiResolutionGenericIOReader.cxx
--- ParaView-v4.4.0-source/ParaViewCore/VTKExtensions/CosmoTools/vtkPMultiResolutionGenericIOReader.cxx.jsoncpp	2015-09-11 11:58:50.000000000 -0600
+++ ParaView-v4.4.0-source/ParaViewCore/VTKExtensions/CosmoTools/vtkPMultiResolutionGenericIOReader.cxx	2015-09-19 13:15:24.403093100 -0600
@@ -85,7 +85,7 @@ public:
       {
       JSON_READ_ERROR();
       }
-    const Json::Value& levelsArray = root.get("levels",Json::Value::null);
+    const Json::Value& levelsArray = root.get("levels",Json::Value::nullRef);
     if (!levelsArray.isArray())
       {
       JSON_READ_ERROR();
@@ -97,7 +97,7 @@ public:
         {
         JSON_READ_ERROR();
         }
-      const Json::Value& timestepsArray = level.get("timesteps",Json::Value::null);
+      const Json::Value& timestepsArray = level.get("timesteps",Json::Value::nullRef);
       if (!timestepsArray.isArray())
         {
         JSON_READ_ERROR();
@@ -111,8 +111,8 @@ public:
           {
           JSON_READ_ERROR();
           }
-        const Json::Value& time = timestep.get("time",Json::Value::null);
-        const Json::Value& file = timestep.get("file",Json::Value::null);
+        const Json::Value& time = timestep.get("time",Json::Value::nullRef);
+        const Json::Value& file = timestep.get("file",Json::Value::nullRef);
         if (!time.isNumeric())
           {
           JSON_READ_ERROR();