From 35fad6df6c70fe74663e52f5478f638cd0ea9023 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jurko=20Gospodneti=C4=87?= <jurko.gospodnetic@pke.hr>
Date: Fri, 20 Jul 2012 14:39:50 +0000
Subject: [PATCH] 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.

[SVN r79621]
---
 v2/build/scanner.jam | 4 ++--
 v2/tools/gcc.jam     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/v2/build/scanner.jam b/v2/build/scanner.jam
index d22eeba55..badf7faea 100644
--- a/v2/build/scanner.jam
+++ b/v2/build/scanner.jam
@@ -40,7 +40,7 @@ class scanner
     #
     rule pattern ( )
     {
-        import errors ;
+        import errors : error : errors.error ;
         errors.error "method must be overriden" ;
     }
 
@@ -49,7 +49,7 @@ class scanner
     #
     rule process ( target : matches * )
     {
-        import errors ;
+        import errors : error : errors.error ;
         errors.error "method must be overriden" ;
     }
 }
diff --git a/v2/tools/gcc.jam b/v2/tools/gcc.jam
index bdcfa2c04..52b03c37e 100644
--- a/v2/tools/gcc.jam
+++ b/v2/tools/gcc.jam
@@ -326,7 +326,7 @@ class gcc-pch-generator : pch-generator
         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)' ;
         }