[Boost-commit] svn:boost r76257 - branches/quickbook-dev/tools/quickbook/src

Subject: [Boost-commit] svn:boost r76257 - branches/quickbook-dev/tools/quickbook/src
From: dnljms_at_[hidden]
Date: 2012-01-01 09:34:41

Author: danieljames
Date: 2012-01-01 09:34:40 EST (Sun, 01 Jan 2012)
New Revision: 76257
URL: http://svn.boost.org/trac/boost/changeset/76257

Log:
Quickbook: Try to get glob working on windows.
Text files modified: 
   branches/quickbook-dev/tools/quickbook/src/actions.cpp |     4 +++-                                    
   1 files changed, 3 insertions(+), 1 deletions(-)

Modified: branches/quickbook-dev/tools/quickbook/src/actions.cpp
==============================================================================
--- branches/quickbook-dev/tools/quickbook/src/actions.cpp	(original)
+++ branches/quickbook-dev/tools/quickbook/src/actions.cpp	2012-01-01 09:34:40 EST (Sun, 01 Jan 2012)
@@ -1859,12 +1859,14 @@
         {
             return p.generic_wstring();
         }
+        static const path_string_t::value_type* glob_chars = L"[]?*";
         #else
         typedef std::string path_string_t;
         inline path_string_t path_to_string(fs::path const & p)
         {
             return p.generic_string();
         }
+        static const path_string_t::value_type* glob_chars = "[]?*";
         #endif
 
         void include_search_glob(std::set<include_search_return> & result,
@@ -1877,7 +1879,7 @@
             fs::path::iterator e = path.end();
             for (; i != e; ++i)
             {
-                if (path_to_string(*i).find_first_of("[]?*") != path_string_t::npos)
+                if (path_to_string(*i).find_first_of(glob_chars) != path_string_t::npos)
                 {
                     glob = *i;
                     for (++i; i != e; ++i) rest /= *i;