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

Merge branch 'feature/new-build' into feature/hadrons

Browse Source 
# Conflicts:
#	Makefile.am
#	scripts/copyright
This commit is contained in:
Antonin Portelli
2016-08-03 16:49:16 +01:00
parent e0b7004f96 3b376ed54e
commit 2485ef9c9c
215 changed files with 8454 additions and 4613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
lib/serialisation/.dirstamp
View File

14
lib/serialisation/Serialisation.h
View File

@ -29,18 +29,18 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
#ifndef GRID_SERIALISATION_READER_H
#define GRID_SERIALISATION_READER_H
#include <serialisation/MacroMagic.h>
#include <serialisation/BaseIO.h>
#include <stdint.h>
#include "MacroMagic.h"
#include "BaseIO.h"
#include "BinaryIO.h"
#include "TextIO.h"
#include "XmlIO.h"
//////////////////////////////////////////
// Todo:
//////////////////////////////////////////
#include <serialisation/BinaryIO.h>
#include <serialisation/TextIO.h>
//#include <serialisation/JsonIO.h>
//#include <serialisation/YamlIO.h>
#include <serialisation/XmlIO.h>
//#include "JsonIO.h"
//#include "YamlIO.h"
//////////////////////////////////////////
// Select the default serialiser use ifdef's

2
lib/serialisation/XmlIO.h
View File

@ -38,7 +38,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
#include <vector>
#include <cassert>
#include "pugixml/pugixml.h"
#include <Grid/pugixml/pugixml.h>
namespace Grid
{