[Boost-commit] svn:boost r69301 - branches/quickbook-filenames/tools/quickbook/src

Subject: [Boost-commit] svn:boost r69301 - branches/quickbook-filenames/tools/quickbook/src
From: dnljms_at_[hidden]
Date: 2011-02-26 06:19:04

Author: danieljames
Date: 2011-02-26 06:19:02 EST (Sat, 26 Feb 2011)
New Revision: 69301
URL: http://svn.boost.org/trac/boost/changeset/69301

Log:
Try using wide streams more widely on windows.
Text files modified: 
   branches/quickbook-filenames/tools/quickbook/src/input_path.cpp |     2 ++                                      
   branches/quickbook-filenames/tools/quickbook/src/input_path.hpp |     4 +---                                    
   2 files changed, 3 insertions(+), 3 deletions(-)

Modified: branches/quickbook-filenames/tools/quickbook/src/input_path.cpp
==============================================================================
--- branches/quickbook-filenames/tools/quickbook/src/input_path.cpp	(original)
+++ branches/quickbook-filenames/tools/quickbook/src/input_path.cpp	2011-02-26 06:19:02 EST (Sat, 26 Feb 2011)
@@ -161,8 +161,10 @@
 
     void initialise_output()
     {
+#	if defined(BOOST_MSVC) && BOOST_MSVC >= 1400
         if (_isatty(_fileno(stdout))) _setmode(_fileno(stdout), _O_U16TEXT);
         if (_isatty(_fileno(stderr))) _setmode(_fileno(stderr), _O_U16TEXT);
+#	endif
     }
 
     void write_utf8(ostream& out, std::string const& x)

Modified: branches/quickbook-filenames/tools/quickbook/src/input_path.hpp
==============================================================================
--- branches/quickbook-filenames/tools/quickbook/src/input_path.hpp	(original)
+++ branches/quickbook-filenames/tools/quickbook/src/input_path.hpp	2011-02-26 06:19:02 EST (Sat, 26 Feb 2011)
@@ -19,9 +19,7 @@
 #   define QUICKBOOK_CYGWIN_PATHS 1
 #elif defined(_WIN32)
 #   define QUICKBOOK_WIDE_PATHS 1
-#   if defined(BOOST_MSVC) && BOOST_MSVC >= 1400
-#       define QUICKBOOK_WIDE_STREAMS 1
-#   endif
+#   define QUICKBOOK_WIDE_STREAMS 1
 #endif
 
 #if !defined(QUICKBOOK_WIDE_PATHS)