portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-12-20 12:44:30 +00:00
Code Releases Activity

Serial IO code cleaning for std:: convention

Browse Source
This commit is contained in:
Antonin Portelli
2018-03-27 17:11:50 +01:00
parent 8a0cf0194f
commit 5ec903044d
4 changed files with 31 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/serialisation/JSON_IO.cc
View File

@@ -28,11 +28,10 @@
#include <Grid/Grid.h>
using namespace Grid;
using namespace std;
// Writer implementation ///////////////////////////////////////////////////////
JSONWriter::JSONWriter(const string &fileName)
: fileName_(fileName), ss_("{ ", ostringstream::ate){}
JSONWriter::JSONWriter(const std::string &fileName)
: fileName_(fileName), ss_("{ ", std::ostringstream::ate){}
JSONWriter::~JSONWriter(void)
{
@@ -46,7 +45,7 @@ JSONWriter::~JSONWriter(void)
os << std::setw(2) << json::parse(ss_.str()) << std::endl;
}
void JSONWriter::push(const string &s)
void JSONWriter::push(const std::string &s)
{
// adding a nested object
if (s.size())
@@ -90,7 +89,7 @@ namespace Grid
// Reader implementation ///////////////////////////////////////////////////////
JSONReader::JSONReader(const string &fileName)
JSONReader::JSONReader(const std::string &fileName)
: fileName_(fileName)
{
std::ifstream file(fileName_);
@@ -102,7 +101,7 @@ JSONReader::JSONReader(const string &fileName)
jcur_ = jobject_;
}
bool JSONReader::push(const string &s)
bool JSONReader::push(const std::string &s)
{
if (s.size()){
jold_.push_back(jcur_);
@@ -159,7 +158,7 @@ bool JSONReader::nextElement(const std::string &s)
}
template <>
void JSONReader::readDefault(const string &s, string &output)
void JSONReader::readDefault(const std::string &s, std::string &output)
{
//cout << "JSONReader::readDefault(string) : " << s<< " " << jcur_ << endl;
if (s.size()){