From 8a3e20ad4c12d42c2d9ac243a6766e6e322728de Mon Sep 17 00:00:00 2001
From: John Fletcher <J.P.Fletcher@aston.ac.uk>
Date: Thu, 23 Jan 2014 17:22:23 +0000
Subject: [PATCH 1/3] test/jamfile Reinstate bug_000008

---
 test/Jamfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/Jamfile b/test/Jamfile
index 9535585..70f0bd7 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -85,7 +85,7 @@ test-suite phoenix_scope :
     [ run scope/let_tests.cpp ] 
     [ run scope/dynamic_tests.cpp ] 
     [ run scope/bug3289.cpp ]
-#    [ run scope/bug_000008.cpp : : : $(multi-threading) ] 
+    [ run scope/bug_000008.cpp : : : $(multi-threading) ] 
     ;
 
 test-suite phoenix_algorithm :

From 7423dcd8b3cfa96d0e46a5f9c2b9719f33963f6a Mon Sep 17 00:00:00 2001
From: John Fletcher <J.P.Fletcher@aston.ac.uk>
Date: Thu, 23 Jan 2014 17:23:10 +0000
Subject: [PATCH 2/3] test/scope/bug_000008.cpp Altered to use Phoenix

---
 test/scope/bug_000008.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/scope/bug_000008.cpp b/test/scope/bug_000008.cpp
index cd524d1..d5820b6 100644
--- a/test/scope/bug_000008.cpp
+++ b/test/scope/bug_000008.cpp
@@ -11,11 +11,13 @@
   // for a description of the bug being tested for by this program
   //
   // This code is borrowed from Spirit's bug_000008.cpp test for multithreads.
+  // Now modified to point to the Phoenix headers
+  // instead of the ones in Spirit.
 #include <iostream>
 #include <boost/config.hpp>
 #include <boost/assert.hpp>
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/spirit/home/phoenix/scope/dynamic.hpp>
+#include <boost/phoenix/scope/dynamic.hpp>
 
 #if defined(DONT_HAVE_BOOST)                        \
     || !defined(BOOST_HAS_THREADS)                  \
@@ -42,8 +44,8 @@ main()
 #else
 // the real MT stuff
 
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/include/phoenix_scope.hpp>
+#include <boost/phoenix/operator.hpp>
+#include <boost/phoenix/scope.hpp>
 #include <boost/thread.hpp>
 
 static const int number_of_calls_per_thread=20000;

From 64f483db39f033cdc8608e8d8781e493bbb696ee Mon Sep 17 00:00:00 2001
From: John Fletcher <J.P.Fletcher@aston.ac.uk>
Date: Thu, 23 Jan 2014 17:31:53 +0000
Subject: [PATCH 3/3] test/scope/bug_000008.cpp Modified file now runs with gcc
 4.6

---
 test/scope/bug_000008.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/scope/bug_000008.cpp b/test/scope/bug_000008.cpp
index d5820b6..de39398 100644
--- a/test/scope/bug_000008.cpp
+++ b/test/scope/bug_000008.cpp
@@ -52,7 +52,8 @@ static const int number_of_calls_per_thread=20000;
 
 struct test_dynamic : boost::phoenix::dynamic<int>
 {
-    test_dynamic() : b(*this) {}
+  //    test_dynamic() : b(*this) {}
+  test_dynamic() : b(init<0>(this)) {}
     member1 b;
 };