From b336d8d6978016da8e5d0a09d1dec670a44f1351 Mon Sep 17 00:00:00 2001
From: Joerg Stelzer <joerg.stelzer@cern.ch>
Date: Mon, 21 Jun 2010 12:25:56 +0000
Subject: [PATCH] attempt to fix compilation error due to preprocessing
git-svn-id: http://root.cern.ch/svn/root/trunk@34011 27541ba8-7e3a-0410-8455-c3a389f83636
---
tmva/inc/MethodBase.h | 2 +-
tmva/inc/Reader.h | 3 ++-
tmva/src/Reader.cxx | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/tmva/inc/MethodBase.h b/tmva/inc/MethodBase.h
index abab82cc9e1..49e47a65ff1 100644
--- a/tmva/inc/MethodBase.h
+++ b/tmva/inc/MethodBase.h
@@ -211,7 +211,7 @@ namespace TMVA {
public: // these two need to be public, they are used to read in-memory weight-files
void ReadStateFromStream ( std::istream& tf ); // backward compatibility
void ReadStateFromStream ( TFile& rf ); // backward compatibility
-#if ROOT_SVN_REVISION >= 32259 && (ROOT_VERSION_CODE >= ROOT_VERSION(5,26,0))
+#if (ROOT_SVN_REVISION >= 32259) && (ROOT_VERSION_CODE >= ROOT_VERSION(5,26,0))
void ReadStateFromXMLString( const char* xmlstr ); // for reading from memory
#endif
diff --git a/tmva/inc/Reader.h b/tmva/inc/Reader.h
index fbf06192a98..f956d4520e0 100644
--- a/tmva/inc/Reader.h
+++ b/tmva/inc/Reader.h
@@ -86,7 +86,8 @@ namespace TMVA {
// book MVA method via weight file
IMethod* BookMVA( const TString& methodTag, const TString& weightfile );
-#if ROOT_SVN_REVISION >= 32259
+#if (ROOT_SVN_REVISION >= 32259) && (ROOT_VERSION_CODE >= ROOT_VERSION(5,26,0))
+
IMethod* BookMVA( TMVA::Types::EMVA methodType, const char* xmlstr );
#endif
IMethod* FindMVA( const TString& methodTag );
diff --git a/tmva/src/Reader.cxx b/tmva/src/Reader.cxx
index 6fe71cf4c4c..102dd34cc71 100644
--- a/tmva/src/Reader.cxx
+++ b/tmva/src/Reader.cxx
@@ -398,7 +398,7 @@ TMVA::IMethod* TMVA::Reader::BookMVA( TMVA::Types::EMVA methodType, const TStrin
return method;
}
-#if ROOT_SVN_REVISION >= 32259 && (ROOT_VERSION_CODE >= ROOT_VERSION(5,26,0))
+#if (ROOT_SVN_REVISION >= 32259) && (ROOT_VERSION_CODE >= ROOT_VERSION(5,26,0))
//_______________________________________________________________________
TMVA::IMethod* TMVA::Reader::BookMVA( TMVA::Types::EMVA methodType, const char* xmlstr )
{
--
GitLab