Update copyrights

[modules/paravis.git] / src / Plugins / JSONReader / ParaViewPlugin / vtkJSONReader.cxx

diff --git a/src/Plugins/JSONReader/ParaViewPlugin/vtkJSONReader.cxx b/src/Plugins/JSONReader/ParaViewPlugin/vtkJSONReader.cxx
index 855d7a97894469a11cf5b5abf74307c5ca958ed9..6160f29d7b6a7cb5a9cdd2261dd1352f57f9368a 100644 (file)
--- a/src/Plugins/JSONReader/ParaViewPlugin/vtkJSONReader.cxx
+++ b/src/Plugins/JSONReader/ParaViewPlugin/vtkJSONReader.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2015 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2015-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -66,7 +66,7 @@ const char* vtkJSONException::what() const throw() {
 //---------------------------------------------------
 class Container {
 public:
-  typedef std::vector<std::pair<std::string,std::vector<double>>> DataType;
+  typedef std::vector<std::pair<std::string,std::vector<double> > > DataType;
   Container(){}
   void initKeys(std::vector<std::string> &keys, std::string &err) {
     for(int i = 0; i < keys.size(); i++) {
@@ -97,7 +97,7 @@ public:
     }
     if(!found) {
       std::ostringstream oss;
-      oss<<"Bad key value '"<<key<"'";
+      oss<<"Bad key value '"<<key<<"'";
       err = oss.str();
     }
   }
@@ -156,7 +156,7 @@ int vtkJSONReader::RequestData(vtkInformation*,
     return 0;
 
   try {
-    return this->Parse(root, output_table);
+    this->Parse(root, output_table);
     return 1;
   } 
   catch(vtkJSONException e)  {
@@ -213,7 +213,7 @@ int vtkJSONReader::CanParseFile(const char *fname, Json::Value &root)
 }
 
 //---------------------------------------------------
-int vtkJSONReader::Parse(Json::Value& root, vtkTable *table) {
+void vtkJSONReader::Parse(Json::Value& root, vtkTable *table) {
   bool hasShortNames = false;
   bool hasUnits = false;
   Container container;