From 1d69d5cbbbc85d2caee5b5b156c030c33455b771 Mon Sep 17 00:00:00 2001
From: Michael Caisse <mcaisse@ciere.com>
Date: Sat, 21 Jul 2012 10:09:58 -0700
Subject: [PATCH] checkpoint

---
 test/Jamfile             | 61 +++++++++++++++++++++++++++++++++++-----
 test/boost-build.jam     |  1 -
 test/parse_yaml_test.cpp |  2 +-
 test/scalar.cpp          |  1 +
 yaml/detail/ast_impl.hpp |  1 +
 5 files changed, 57 insertions(+), 9 deletions(-)
 delete mode 100644 test/boost-build.jam

diff --git a/test/Jamfile b/test/Jamfile
index 7ef11148..68d47ea4 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -7,10 +7,22 @@
 project yaml_parser_test
     : requirements
         <toolset>gcc:<cxxflags>-std=c++0x
+        <toolset>gcc:<cxxflags>-Wall
+#        <toolset>gcc:<cxxflags>-Wconversion
+#        <toolset>gcc:<cxxflags>-Wshadow
+        <toolset>gcc:<cxxflags>-Wvla
+        <toolset>gcc:<cxxflags>-Wno-overloaded-virtual
+        <toolset>clang:<cxxflags>-std=c++0x
+        <toolset>clang:<cxxflags>-stdlib=libc++
+        <toolset>clang:<cxxflags>-Wall
+        <toolset>clang:<cxxflags>-Wconversion
+#        <toolset>clang:<cxxflags>-Wshadow
+        <toolset>clang:<cxxflags>-Wvla
+        <toolset>clang:<cxxflags>-Wno-overloaded-virtual
         <toolset>gcc:<cxxflags>-ftemplate-depth-300
         <variant>release:<location>"bin/release"
         <variant>debug:<location>"bin/debug"
-        <variant>debug:<define>BOOST_SPIRIT_DEBUG
+#        <variant>debug:<define>BOOST_SPIRIT_DEBUG
         <include>$(BOOST_ROOT)
     :
     ;
@@ -18,12 +30,47 @@ project yaml_parser_test
 import modules ;
 
 exe test :
-    scalar.cpp
-    flow.cpp
-    block.cpp
-    yaml.cpp
-    parse_yaml_test.cpp
-;
+	scalar.cpp
+	flow.cpp
+	block.cpp
+	yaml.cpp
+	parse_yaml_test.cpp
+        /vendor/boost//headers
+	:
+	<include>..
+	;
+
+
+exe test1 :
+	scalar1.cpp
+	flow1.cpp
+	block1.cpp
+	yaml1.cpp
+	test1.cpp
+        /vendor/boost//headers
+	:
+	<include>..
+	;
+
+
+exe test2 :
+	scalar1.cpp
+	flow1.cpp
+	block1.cpp
+	yaml1.cpp
+	test2.cpp
+	value.cpp
+	util.cpp
+        /vendor/boost//headers
+	:
+	<include>..
+	;
+
+
+exe include_test :
+	include_test.cpp
+        /vendor/boost//headers
+	;
 
 
 
diff --git a/test/boost-build.jam b/test/boost-build.jam
deleted file mode 100644
index 74a3a087..00000000
--- a/test/boost-build.jam
+++ /dev/null
@@ -1 +0,0 @@
-boost-build $(BOOST_ROOT)/tools/build/v2 ;
diff --git a/test/parse_yaml_test.cpp b/test/parse_yaml_test.cpp
index 11da3441..f6540615 100644
--- a/test/parse_yaml_test.cpp
+++ b/test/parse_yaml_test.cpp
@@ -6,7 +6,7 @@
  *   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-//~ #define BOOST_SPIRIT_DEBUG
+#define BOOST_SPIRIT_DEBUG
 
 #include "../yaml/parser/yaml.hpp"
 
diff --git a/test/scalar.cpp b/test/scalar.cpp
index eb305a76..62504759 100644
--- a/test/scalar.cpp
+++ b/test/scalar.cpp
@@ -4,6 +4,7 @@
  *   Distributed under the Boost Software License, Version 1.0. (See accompanying
  *   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
+#define BOOST_SPIRIT_DEBUG
 
 #include "../yaml/parser/scalar_def.hpp"
 #include <iostream>
diff --git a/yaml/detail/ast_impl.hpp b/yaml/detail/ast_impl.hpp
index 814fd251..ea7c8605 100644
--- a/yaml/detail/ast_impl.hpp
+++ b/yaml/detail/ast_impl.hpp
@@ -10,6 +10,7 @@
 
 #include "../ast.hpp"
 #include <algorithm>
+#include <boost/spirit/include/qi.hpp>  // boost::spirit::to_utf8
 #include <boost/foreach.hpp>
 #include <boost/math/special_functions/fpclassify.hpp>
 #include <boost/regex/pending/unicode_iterator.hpp>