[Performous-commit] Lasse Karkkainen : Downgrade Spirit code so that we can run on Boost 1. 34 instead of 1.36.

[Lasse Kärkkäi. <tr...@us...>]

Module: performous
Branch: master
Commit: dd2b8be407aaccf3cd5d5daff154f7785976430b

Author: Lasse Karkkainen <tro...@tr...>
Date:   Mon Jul  6 04:58:35 2009 +0300

Downgrade Spirit code so that we can run on Boost 1.34 instead of 1.36.

---

 game/main.cc                          |    5 +++--
 libs/libda/plugins/CMakeLists.txt     |    2 +-
 libs/libda/plugins/audio_dev_tone.cpp |    5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/game/main.cc b/game/main.cc
index fcf3ea2..c6957e4 100644
--- a/game/main.cc
+++ b/game/main.cc
@@ -10,7 +10,8 @@
 #include "xtime.hh"
 #include <boost/format.hpp>
 #include <boost/program_options.hpp>
-#include <boost/spirit/include/classic_core.hpp>
+// Needs at least Boost 1.36 and many systems don't have that: #include <boost/spirit/include/classic_core.hpp>
+#include <boost/spirit/core.hpp>
 #include <boost/thread.hpp>
 #include <libda/audio.hpp>
 #include <csignal>
@@ -76,7 +77,7 @@ static void checkEvents_SDL(ScreenManager& sm, Window& window) {
 
 void audioSetup(Capture& capture, Audio& audio) {
 	// initialize audio argument parser
-	using namespace boost::spirit::classic;
+	using namespace boost::spirit; //::classic;
 	unsigned channels, rate, frames;
 	std::string devstr;
 	// channel       ::= "channel=" integer
diff --git a/libs/libda/plugins/CMakeLists.txt b/libs/libda/plugins/CMakeLists.txt
index 1dd67c2..2699172 100644
--- a/libs/libda/plugins/CMakeLists.txt
+++ b/libs/libda/plugins/CMakeLists.txt
@@ -98,7 +98,7 @@ endif(LIBDA_PLUGIN_PULSE)
 if(LIBDA_PLUGIN_TESTING)
 	set(Boost_USE_STATIC_LIBS ON)
 	set(Boost_USE_MULTITHREAD ON)
-	find_package(Boost 1.36 REQUIRED COMPONENTS thread date_time)
+	find_package(Boost 1.34 REQUIRED COMPONENTS thread date_time)
 	if(Boost_FOUND)
 		set(PLUGIN_TESTING_DESC "enabled")
 		set(PLUGIN_TESTING true)
diff --git a/libs/libda/plugins/audio_dev_tone.cpp b/libs/libda/plugins/audio_dev_tone.cpp
index 1f2365e..a0140f1 100644
--- a/libs/libda/plugins/audio_dev_tone.cpp
+++ b/libs/libda/plugins/audio_dev_tone.cpp
@@ -2,7 +2,8 @@
 #include <boost/scoped_ptr.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/lambda/bind.hpp>
-#include <boost/spirit/include/classic_core.hpp>
+// Needs at least Boost 1.36 and many systems don't have that: #include <boost/spirit/include/classic_core.hpp>
+#include <boost/spirit/core.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/thread/xtime.hpp>
 #include <algorithm>
@@ -59,7 +60,7 @@ namespace {
 		boost::xtime time;
 		void add(std::string const& tonestr) {
 			double freq = 440.0, amplitude = 0.1, phase = 0.0;
-			using namespace boost::spirit::classic;
+			using namespace boost::spirit; //::classic;
 			using namespace boost::lambda;
 			placeholder1_type arg1;
 			if (!parse(tonestr.c_str(),