[yoda-svn] yoda: YODA headers must not refer to yaml haders, they are for i...

YODA Mercurial yoda at projects.hepforge.org
Wed Jun 20 23:30:02 BST 2018


details:   https://yoda.hepforge.org/hg/yoda/rev/b6ec724e0838
branches:  release-1-7
changeset: 1466:b6ec724e0838
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Wed Jun 20 23:21:25 2018 +0100
description:
YODA headers must not refer to yaml haders, they are for internal use only.

diffs (truncated from 53 to 50 lines):

--- a/include/YODA/Scatter1D.h	Fri Jun 15 14:32:02 2018 +0100
+++ b/include/YODA/Scatter1D.h	Wed Jun 20 23:21:25 2018 +0100
@@ -11,10 +11,6 @@
 #include "YODA/Utils/sortedvector.h"
 #include <utility>
 #include <memory>
-#include "yaml-cpp/yaml.h"
-#ifdef YAML_NAMESPACE
-#define YAML YAML_NAMESPACE
-#endif
 
 namespace YODA {
 
--- a/include/YODA/Scatter2D.h	Fri Jun 15 14:32:02 2018 +0100
+++ b/include/YODA/Scatter2D.h	Wed Jun 20 23:21:25 2018 +0100
@@ -11,10 +11,6 @@
 #include "YODA/Utils/sortedvector.h"
 #include <utility>
 #include <memory>
-#include "yaml-cpp/yaml.h"
-#ifdef YAML_NAMESPACE
-#define YAML YAML_NAMESPACE
-#endif
 
 namespace YODA {
 
--- a/include/YODA/Scatter3D.h	Fri Jun 15 14:32:02 2018 +0100
+++ b/include/YODA/Scatter3D.h	Wed Jun 20 23:21:25 2018 +0100
@@ -11,10 +11,6 @@
 #include "YODA/Utils/sortedvector.h"
 #include <utility>
 #include <memory>
-#include "yaml-cpp/yaml.h"
-#ifdef YAML_NAMESPACE
-#define YAML YAML_NAMESPACE
-#endif
 
 namespace YODA {
 
--- a/src/WriterYODA.cc	Fri Jun 15 14:32:02 2018 +0100
+++ b/src/WriterYODA.cc	Wed Jun 20 23:21:25 2018 +0100
@@ -5,6 +5,11 @@
 //
 #include "YODA/WriterYODA.h"
 
+#include "yaml-cpp/yaml.h"
+#ifdef YAML_NAMESPACE
+#define YAML YAML_NAMESPACE
+#endif
+


More information about the yoda-svn mailing list