[Boost-commit] svn:boost r64657 - branches/quickbook-1.5-spirit2

Subject: [Boost-commit] svn:boost r64657 - branches/quickbook-1.5-spirit2
From: daniel_james_at_[hidden]
Date: 2010-08-07 08:20:26

Author: danieljames
Date: 2010-08-07 08:20:12 EDT (Sat, 07 Aug 2010)
New Revision: 64657
URL: http://svn.boost.org/trac/boost/changeset/64657

Log:
Merge from trunk to quickbook spirit 2 branch.
Properties modified: 
   branches/quickbook-1.5-spirit2/   (props changed)
Text files modified: 
   branches/quickbook-1.5-spirit2/Jamfile.v2        |     1 -                                       
   branches/quickbook-1.5-spirit2/block_actions.cpp |     2 +-                                      
   branches/quickbook-1.5-spirit2/input_path.cpp    |     8 ++++----                                
   branches/quickbook-1.5-spirit2/phrase_image.cpp  |     4 ++--                                    
   branches/quickbook-1.5-spirit2/quickbook.cpp     |     4 ++--                                    
   branches/quickbook-1.5-spirit2/state.cpp         |     2 +-                                      
   branches/quickbook-1.5-spirit2/state.hpp         |     2 +-                                      
   7 files changed, 11 insertions(+), 12 deletions(-)

Modified: branches/quickbook-1.5-spirit2/Jamfile.v2
==============================================================================
--- branches/quickbook-1.5-spirit2/Jamfile.v2	(original)
+++ branches/quickbook-1.5-spirit2/Jamfile.v2	2010-08-07 08:20:12 EDT (Sat, 07 Aug 2010)
@@ -17,7 +17,6 @@
         <toolset>darwin:<cflags>-g0
         <debug-symbols>off
         <warnings>off
-        <define>BOOST_FILESYSTEM_VERSION=3
     ;
 
 exe quickbook

Modified: branches/quickbook-1.5-spirit2/block_actions.cpp
==============================================================================
--- branches/quickbook-1.5-spirit2/block_actions.cpp	(original)
+++ branches/quickbook-1.5-spirit2/block_actions.cpp	2010-08-07 08:20:12 EDT (Sat, 07 Aug 2010)
@@ -10,7 +10,7 @@
 
 #include <numeric>
 #include <boost/assert.hpp>
-#include <boost/filesystem/convenience.hpp>
+#include <boost/filesystem/v3/convenience.hpp>
 #include "block_actions.hpp"
 #include "actions.hpp"
 #include "state.hpp"

Modified: branches/quickbook-1.5-spirit2/input_path.cpp
==============================================================================
--- branches/quickbook-1.5-spirit2/input_path.cpp	(original)
+++ branches/quickbook-1.5-spirit2/input_path.cpp	2010-08-07 08:20:12 EDT (Sat, 07 Aug 2010)
@@ -30,7 +30,7 @@
 
 // Cygwin 1.5.x
 
-#include <boost/filesystem/config.hpp>
+#include <boost/filesystem/v3/config.hpp>
 #include <windows.h>
 #include <sys/cygwin.h>
 
@@ -50,7 +50,7 @@
 #elif defined(BOOST_POSIX_PATH)
         cygwin_conv_to_posix_path(path.c_str(), result);
 #else
-#    error "Bosot filesystem path type doesn't seem to be set."
+#    error "Boost filesystem path type doesn't seem to be set."
 #endif
 
         v = input_path(result);
@@ -61,7 +61,7 @@
 
 // Cygwin 1.7.x
     
-#include <boost/filesystem/config.hpp>
+#include <boost/filesystem/v3/config.hpp>
 #include <boost/scoped_array.hpp>
 #include <boost/program_options/errors.hpp>
 #include <windows.h>
@@ -81,7 +81,7 @@
 #elif defined(BOOST_POSIX_PATH)
         cygwin_conv_path_t flags = CCP_WIN_A_TO_POSIX | CCP_RELATIVE;
 #else
-#    error "Bosot filesystem path type doesn't seem to be set."
+#    error "Boost filesystem path type doesn't seem to be set."
 #endif
 
         ssize_t size = cygwin_conv_path(flags, path.c_str(), NULL, 0);

Modified: branches/quickbook-1.5-spirit2/phrase_image.cpp
==============================================================================
--- branches/quickbook-1.5-spirit2/phrase_image.cpp	(original)
+++ branches/quickbook-1.5-spirit2/phrase_image.cpp	2010-08-07 08:20:12 EDT (Sat, 07 Aug 2010)
@@ -8,8 +8,8 @@
     http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include <boost/filesystem/convenience.hpp>
-#include <boost/filesystem/fstream.hpp>
+#include <boost/filesystem/v3/convenience.hpp>
+#include <boost/filesystem/v3/fstream.hpp>
 #include "phrase_actions.hpp"
 #include "phrase.hpp"
 #include "gen_types.hpp"

Modified: branches/quickbook-1.5-spirit2/quickbook.cpp
==============================================================================
--- branches/quickbook-1.5-spirit2/quickbook.cpp	(original)
+++ branches/quickbook-1.5-spirit2/quickbook.cpp	2010-08-07 08:20:12 EDT (Sat, 07 Aug 2010)
@@ -13,8 +13,8 @@
 #include <iostream>
 #include <vector>
 #include <boost/program_options.hpp>
-#include <boost/filesystem/path.hpp>
-#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/v3/path.hpp>
+#include <boost/filesystem/v3/operations.hpp>
 #include <boost/ref.hpp>
 #include "fwd.hpp"
 #include "quickbook.hpp"

Modified: branches/quickbook-1.5-spirit2/state.cpp
==============================================================================
--- branches/quickbook-1.5-spirit2/state.cpp	(original)
+++ branches/quickbook-1.5-spirit2/state.cpp	2010-08-07 08:20:12 EDT (Sat, 07 Aug 2010)
@@ -9,7 +9,7 @@
     http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/v3/operations.hpp>
 #include "actions.hpp"
 #include "state.hpp"
 #include "quickbook.hpp"

Modified: branches/quickbook-1.5-spirit2/state.hpp
==============================================================================
--- branches/quickbook-1.5-spirit2/state.hpp	(original)
+++ branches/quickbook-1.5-spirit2/state.hpp	2010-08-07 08:20:12 EDT (Sat, 07 Aug 2010)
@@ -12,7 +12,7 @@
 
 #include <stack>
 #include <boost/tuple/tuple.hpp>
-#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/v3/path.hpp>
 #include "fwd.hpp"
 #include "collector.hpp"
 #include "template.hpp"