Small change to avoid problems when using Boost >= 1.38.0

src/include/PFunction.h

@@ -34,8 +34,15 @@
 
 #include <vector>
 
-#include <boost/spirit/tree/ast.hpp>
-using namespace boost::spirit;
+#include <boost/version.hpp>
+
+#if BOOST_VERSION >= 103800
+#  include <boost/spirit/include/classic_ast.hpp>
+   using namespace BOOST_SPIRIT_CLASSIC_NS;
+#else
+#  include <boost/spirit/tree/ast.hpp>
+   using namespace boost::spirit;
+#endif
 
 #include <TString.h>
 

src/include/PFunctionGrammar.h

@@ -37,9 +37,17 @@ using namespace std;
 
 //#define BOOST_SPIRIT_DEBUG
 
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/tree/ast.hpp>
-using namespace boost::spirit;
+#include <boost/version.hpp>
+
+#if BOOST_VERSION >= 103800
+#  include <boost/spirit/include/classic_core.hpp>
+#  include <boost/spirit/include/classic_ast.hpp>
+   using namespace BOOST_SPIRIT_CLASSIC_NS;
+#else
+#  include <boost/spirit/core.hpp>
+#  include <boost/spirit/tree/ast.hpp>
+   using namespace boost::spirit;
+#endif
 
 typedef char const* iterator_t;
 typedef tree_match<iterator_t> parse_tree_match_t;

src/musrfit_startup.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<musrfit xmlns="http://nemu.web.psi.ch/musrfit">
+<musrfit xmlns="https://wiki.intranet.psi.ch/MUSR/MusrFit">
     <comment>
         $Id$
         Defines default settings for the musrfit package

src/musrgui/musrgui_startup.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<musrgui_startup xmlns="http://nemu.web.psi.ch/musrgui">
+<musrgui_startup xmlns="https://wiki.intranet.psi.ch/MUSR/MusrGui">
   <comment>
     $Id$
     This is handling default setting parameters for the musrgui.

src/tests/CheckMusrfitInstall/test-histo-ROOT-NPP.msr

@@ -19,7 +19,7 @@ TFieldCos      1     2       (phase frequency)
 #FUNCTIONS
 
 ###############################################################
-RUN 2008/lem08_his_2279 MUE4 PSI ROOT-NPP   (name beamline institute data-file-format)
+RUN lem08_his_2279 MUE4 PSI ROOT-NPP   (name beamline institute data-file-format)
 fittype         0         (single histogram fit)
 norm            5
 backgr.fit      6