portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-09 21:50:45 +01:00
Code Releases Activity

Deprecating JSON, too hard to support under NVCC

Browse Source
This commit is contained in:
Peter Boyle 2019-01-01 15:04:33 +00:00
parent 2b6cfe555f
commit 3a4e397e72
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Grid/serialisation/JSON_IO.cc
View File

@ -26,6 +26,7 @@
*************************************************************************************/ *************************************************************************************/
/* END LEGAL */ /* END LEGAL */
#include <Grid/Grid.h> #include <Grid/Grid.h>
#ifndef __NVCC__
NAMESPACE_BEGIN(Grid); NAMESPACE_BEGIN(Grid);
@ -168,3 +169,4 @@ void JSONReader::readDefault(const std::string &s, std::string &output)
} }
} }
NAMESPACE_END(Grid); NAMESPACE_END(Grid);
#endif

2
Grid/serialisation/Serialisation.h
View File

@ -36,7 +36,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
#include "BinaryIO.h" #include "BinaryIO.h"
#include "TextIO.h" #include "TextIO.h"
#include "XmlIO.h" #include "XmlIO.h"
#include "JSON_IO.h" //#include "JSON_IO.h"
#ifdef HAVE_HDF5 #ifdef HAVE_HDF5
#include "Hdf5IO.h" #include "Hdf5IO.h"

9
Grid/serialisation/TextIO.h
View File

@ -97,6 +97,9 @@ namespace Grid
} }
// Reader template implementation //////////////////////////////////////////// // Reader template implementation ////////////////////////////////////////////
template <>
void TextReader::readDefault(const std::string &s, std::string &output);
template <typename U> template <typename U>
void TextReader::readDefault(const std::string &s, U &output) void TextReader::readDefault(const std::string &s, U &output)
{ {
@ -106,9 +109,6 @@ namespace Grid
fromString(output, buf); fromString(output, buf);
} }
template <>
void TextReader::readDefault(const std::string &s, std::string &output);
template <typename U> template <typename U>
void TextReader::readDefault(const std::string &s, std::vector<U> &output) void TextReader::readDefault(const std::string &s, std::vector<U> &output)
{ {
@ -121,6 +121,9 @@ namespace Grid
read("", output[i]); read("", output[i]);
} }
} }
} }
#endif #endif