C++11 syntax fixes stream >> confusion in DataHandling. refs #6592

mantidproject · Feb 19, 2013 · a84f032 · a84f032
1 parent f886d4d
commit a84f032
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/Code/Mantid/Framework/DataHandling/src/CreateChopperModel.cpp b/Code/Mantid/Framework/DataHandling/src/CreateChopperModel.cpp
@@ -60,13 +60,13 @@ namespace Mantid
       declareProperty(new WorkspaceProperty<>("Workspace","",Direction::InOut), "An workspace to attach the model");
 
       std::vector<std::string> keys(1, "FermiChopperModel");
-      declareProperty("ModelType", "", boost::make_shared<ListValidator<std::string>>(keys),
+      declareProperty("ModelType", "", boost::make_shared<ListValidator<std::string> >(keys),
                       "The string identifier for the model", Direction::Input);
 
-      declareProperty("Parameters", "", boost::make_shared<MandatoryValidator<std::string>>(),
+      declareProperty("Parameters", "", boost::make_shared<MandatoryValidator<std::string> >(),
                       "The parameters for the model as comma-separated list of name=value pairs");
 
-      auto mustBePositive = boost::make_shared<BoundedValidator<int>>();
+      auto mustBePositive = boost::make_shared<BoundedValidator<int> >();
       mustBePositive->setLower(0);
       declareProperty("ChopperPoint", 0, mustBePositive, "The index of the chopper point. (Default=0)");
     }

diff --git a/Code/Mantid/Framework/DataHandling/src/CreateModeratorModel.cpp b/Code/Mantid/Framework/DataHandling/src/CreateModeratorModel.cpp
@@ -54,10 +54,10 @@ namespace DataHandling
     declareProperty(new WorkspaceProperty<>("Workspace","",Direction::InOut), "An input workspace.");
 
     std::vector<std::string> keys(1, "IkedaCarpenterModerator");
-    declareProperty("ModelType", "", boost::make_shared<ListValidator<std::string>>(keys),
+    declareProperty("ModelType", "", boost::make_shared<ListValidator<std::string> >(keys),
                     "The string identifier for the model", Direction::Input);
 
-    declareProperty("Parameters", "", boost::make_shared<MandatoryValidator<std::string>>(),
+    declareProperty("Parameters", "", boost::make_shared<MandatoryValidator<std::string> >(),
                     "The parameters for the model as comma-separated list of name=value pairs");
   }
 

diff --git a/Code/Mantid/Framework/DataHandling/src/CreateSimulationWorkspace.cpp b/Code/Mantid/Framework/DataHandling/src/CreateSimulationWorkspace.cpp
@@ -56,7 +56,7 @@ namespace Mantid
     {
       using namespace Kernel;
 
-      declareProperty("Instrument", "", boost::make_shared<MandatoryValidator<std::string>>(),
+      declareProperty("Instrument", "", boost::make_shared<MandatoryValidator<std::string> >(),
           "An instrument name or filename ( a full path or string containing an xml extension).", Direction::Input);
 
       declareProperty(new ArrayProperty<double>("BinParams", boost::make_shared<RebinParamsValidator>(),Direction::Input),
@@ -65,7 +65,7 @@ namespace Mantid
       declareProperty(new WorkspaceProperty<>("OutputWorkspace","", Direction::Output), "The new workspace");
 
       auto knownUnits = UnitFactory::Instance().getKeys();
-      declareProperty("UnitX", "DeltaE", boost::make_shared<ListValidator<std::string>>(knownUnits),
+      declareProperty("UnitX", "DeltaE", boost::make_shared<ListValidator<std::string> >(knownUnits),
                       "The unit to assign to the X axis", Direction::Input);
 
       declareProperty(new FileProperty("DetectorTableFilename", "",FileProperty::OptionalLoad,"", Direction::Input),
@@ -238,7 +238,7 @@ namespace Mantid
       {
         throw std::runtime_error("Cannot find path to isis_vms_compat. Is the file an ISIS NeXus file?");
       }
-      typedef boost::scoped_ptr<std::vector<int32_t>> NXIntArray;
+      typedef boost::scoped_ptr<std::vector<int32_t> > NXIntArray;
 
       nxsFile.openData("NDET");
       NXIntArray ndets(nxsFile.getData<int32_t>());