[Boost-commit] svn:boost r79621 - in trunk/tools/build/v2: build tools

Subject: [Boost-commit] svn:boost r79621 - in trunk/tools/build/v2: build tools
From: jurko.gospodnetic_at_[hidden]
Date: 2012-07-20 10:39:51

Author: jurko
Date: 2012-07-20 10:39:50 EDT (Fri, 20 Jul 2012)
New Revision: 79621
URL: http://svn.boost.org/trac/boost/changeset/79621

Log:
Fixed minor Boost Build error reporting bugs caused by module rules not being directly available using their full names when imported from inside a class rule - an error about rule errors.error or errors.user-error not being defined was getting reported instead of the desired error. This is due to the fact that rule name resolution does not look in the current module in that case but uses the class module instead.
Text files modified: 
   trunk/tools/build/v2/build/scanner.jam |     4 ++--                                    
   trunk/tools/build/v2/tools/gcc.jam     |     2 +-                                      
   2 files changed, 3 insertions(+), 3 deletions(-)

Modified: trunk/tools/build/v2/build/scanner.jam
==============================================================================
--- trunk/tools/build/v2/build/scanner.jam	(original)
+++ trunk/tools/build/v2/build/scanner.jam	2012-07-20 10:39:50 EDT (Fri, 20 Jul 2012)
@@ -40,7 +40,7 @@
     #
     rule pattern ( )
     {
-        import errors ;
+        import errors : error : errors.error ;
         errors.error "method must be overriden" ;
     }
 
@@ -49,7 +49,7 @@
     #
     rule process ( target : matches * )
     {
-        import errors ;
+        import errors : error : errors.error ;
         errors.error "method must be overriden" ;
     }
 }

Modified: trunk/tools/build/v2/tools/gcc.jam
==============================================================================
--- trunk/tools/build/v2/tools/gcc.jam	(original)
+++ trunk/tools/build/v2/tools/gcc.jam	2012-07-20 10:39:50 EDT (Fri, 20 Jul 2012)
@@ -326,7 +326,7 @@
         if $(header-basename) != $(name)
         {
             local location = [ $(project).project-module ] ;
-            import errors ;
+            import errors : user-error : errors.user-error ;
             errors.user-error "in" $(location): pch target name '$(name)' should
                 be the same as the base name of header file '$(header-name)' ;
         }