portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-06-16 06:47:06 +01:00
Code Releases Activity

Added support for std::pair in the JSON serialiser

Browse Source
This commit is contained in:
Guido Cossu
2017-07-12 14:44:53 +01:00
parent 097c9637ee
commit 184af5bd05
3 changed files with 52 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/serialisation/JSON_IO.cc
View File

@ -42,7 +42,7 @@ JSONWriter::~JSONWriter(void)
// write prettified JSON to file
std::ofstream os(fileName_);
std::cout << "JSONWriter::~JSONWriter" << std::endl;
//std::cout << "JSONWriter::~JSONWriter" << std::endl;
os << std::setw(2) << json::parse(ss_.str()) << std::endl;
}
@ -57,7 +57,7 @@ void JSONWriter::push(const string &s)
void JSONWriter::pop(void)
{
std::cout << "JSONWriter::pop" << std::endl;
//std::cout << "JSONWriter::pop" << std::endl;
delete_comma();
ss_ << "},";
}
@ -69,6 +69,7 @@ void JSONWriter::delete_comma()
ss_.str(dlast);
}
/*
// here we are hitting a g++ bug (Bug 56480)
// compiles fine with clang
// have to wrap in the Grid namespace
@ -76,8 +77,7 @@ void JSONWriter::delete_comma()
namespace Grid
{
template<>
void JSONWriter::writeDefault(const std::string &s,
const std::string &x)
void JSONWriter::writeDefault(const std::string &s, const std::string &x)
{
if (s.size())
ss_ << "\""<< s << "\" : \"" << x << "\" ," ;
@ -85,7 +85,7 @@ namespace Grid
ss_ << "\"" << x << "\" ," ;
}
}// namespace Grid
*/
// Reader implementation ///////////////////////////////////////////////////////
JSONReader::JSONReader(const string &fileName)
@ -140,6 +140,7 @@ void JSONReader::pop(void)
bool JSONReader::nextElement(const std::string &s)
{
// Work in progress
// JSON dictionaries do not support multiple names
// Same name objects must be packed in vectors
++it_;