1
0
mirror of https://github.com/paboyle/Grid.git synced 2025-06-16 23:07:05 +01:00

Compiles after merging

This commit is contained in:
Guido Cossu
2017-01-25 12:11:58 +00:00
parent 17629b8d9e
commit f7fbbaaca3
4 changed files with 39 additions and 14 deletions

View File

@ -8,6 +8,7 @@
Author: Antonin Portelli <antonin.portelli@me.com>
Author: Peter Boyle <paboyle@ph.ed.ac.uk>
Author: Guido Cossu <guido.cossu@ed.ac.uk>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -182,6 +183,16 @@ namespace Grid {
T *upcast;
};
// What is the vtype
template<typename T> struct isReader {
static const bool value = false;
};
template<typename T> struct isWriter {
static const bool value = false;
};
// Generic writer interface
// serializable base class
class Serializable
@ -326,7 +337,6 @@ namespace Grid {
}
// Generic writer interface //////////////////////////////////////////////////
>>>>>>> develop
template <typename T>
inline void push(Writer<T> &w, const std::string &s) {
w.push(s);