From a16b1e134ea9f7d7353648aa09a64ffefc275ab9 Mon Sep 17 00:00:00 2001 From: paboyle Date: Tue, 13 Jun 2017 10:48:43 +0100 Subject: [PATCH] gcc 4.9 fix --- lib/parallelIO/MetaData.h | 8 +++++--- tests/IO/Test_serialisation.cc | 5 ++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/parallelIO/MetaData.h b/lib/parallelIO/MetaData.h index 85a6e0b9..1bad07f2 100644 --- a/lib/parallelIO/MetaData.h +++ b/lib/parallelIO/MetaData.h @@ -37,9 +37,6 @@ #include namespace Grid { - namespace QCD { - - using namespace Grid; //////////////////////////////////////////////////////////////////////////////// // header specification/interpretation @@ -71,6 +68,11 @@ namespace Grid { std::string, floating_point); }; + namespace QCD { + + using namespace Grid; + + ////////////////////////////////////////////////////////////////////// // Bit and Physical Checksumming and QA of data ////////////////////////////////////////////////////////////////////// diff --git a/tests/IO/Test_serialisation.cc b/tests/IO/Test_serialisation.cc index ceddee77..6d918787 100644 --- a/tests/IO/Test_serialisation.cc +++ b/tests/IO/Test_serialisation.cc @@ -45,8 +45,8 @@ public: double, y, bool , b, std::vector, array, - std::vector>, twodimarray, - std::vector>>, cmplx3darray + std::vector >, twodimarray, + std::vector > >, cmplx3darray ); myclass() {} myclass(int i) @@ -63,7 +63,6 @@ public: } }; - int16_t i16 = 1; uint16_t u16 = 2; int32_t i32 = 3;