[Boost-commit] svn:boost r64656 - trunk/tools/bcp

Subject: [Boost-commit] svn:boost r64656 - trunk/tools/bcp
From: john_at_[hidden]
Date: 2010-08-07 07:54:10

Author: johnmaddock
Date: 2010-08-07 07:53:53 EDT (Sat, 07 Aug 2010)
New Revision: 64656
URL: http://svn.boost.org/trac/boost/changeset/64656

Log:
Catch more filesystem errors, otherwise parsing things like #include <:sys:stats.h> fail on Linux.
Text files modified: 
   trunk/tools/bcp/add_path.cpp |    36 ++++++++++++++++++------------------    
   1 files changed, 18 insertions(+), 18 deletions(-)

Modified: trunk/tools/bcp/add_path.cpp
==============================================================================
--- trunk/tools/bcp/add_path.cpp	(original)
+++ trunk/tools/bcp/add_path.cpp	2010-08-07 07:53:53 EDT (Sat, 07 Aug 2010)
@@ -291,6 +291,24 @@
             continue;
          }
          include_file = i->str();
+         fs::path test_file(m_boost_path / p.branch_path() / include_file);
+         if(fs::exists(test_file) && !fs::is_directory(test_file) && (p.branch_path().string() != "boost"))
+         {
+            if(!m_dependencies.count(p.branch_path() / include_file)) 
+            {
+               m_dependencies[p.branch_path() / include_file] = p;
+               add_path(p.branch_path() / include_file);
+            }
+         }
+         else if(fs::exists(m_boost_path / include_file))
+         {
+            if(!m_dependencies.count(include_file)) 
+            {
+               m_dependencies[include_file] = p;
+               add_path(include_file);
+            }
+         }
+         ++i;
       }
       catch(const fs::filesystem_error&)
       {
@@ -298,24 +316,6 @@
          ++i;
          continue;
       }
-      fs::path test_file(m_boost_path / p.branch_path() / include_file);
-      if(fs::exists(test_file) && !fs::is_directory(test_file) && (p.branch_path().string() != "boost"))
-      {
-         if(!m_dependencies.count(p.branch_path() / include_file)) 
-         {
-            m_dependencies[p.branch_path() / include_file] = p;
-            add_path(p.branch_path() / include_file);
-         }
-      }
-      else if(fs::exists(m_boost_path / include_file))
-      {
-         if(!m_dependencies.count(include_file)) 
-         {
-            m_dependencies[include_file] = p;
-            add_path(include_file);
-         }
-      }
-      ++i;
    }
    //
    // Now we need to scan for Boost.Preprocessor includes that