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

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

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

Log:
Boost Build code cleanup - minor stylistic changes.
Text files modified: 
   trunk/tools/build/v2/build/type.jam |     2 +-                                      
   trunk/tools/build/v2/tools/cast.jam |     6 +++---                                  
   2 files changed, 4 insertions(+), 4 deletions(-)

Modified: trunk/tools/build/v2/build/type.jam
==============================================================================
--- trunk/tools/build/v2/build/type.jam	(original)
+++ trunk/tools/build/v2/build/type.jam	2012-07-20 10:42:18 EDT (Fri, 20 Jul 2012)
@@ -48,7 +48,7 @@
         import errors ;
         errors.error "Type $(type) is already registered." ;
     }
-    else
+
     {
         .types += $(type) ;
         .base.$(type) = $(base-type) ;

Modified: trunk/tools/build/v2/tools/cast.jam
==============================================================================
--- trunk/tools/build/v2/tools/cast.jam	(original)
+++ trunk/tools/build/v2/tools/cast.jam	2012-07-20 10:42:18 EDT (Fri, 20 Jul 2012)
@@ -24,7 +24,6 @@
 # > simpler than defining a main target rule.
 
 import "class" : new ;
-import errors ;
 import project ;
 import property-set ;
 import targets ;
@@ -49,12 +48,12 @@
         {
             if ! [ class.is-a $(s) : file-target ]
             {
-                import errors ;
+                import errors : user-error : errors.user-error ;
                 errors.user-error Source to the 'cast' rule is not a file! ;
             }
             if [ $(s).action ]
             {
-                import errors ;
+                import errors : user-error : errors.user-error ;
                 errors.user-error Only non-derived target are allowed for
                     'cast'. : when building [ full-name ] ;
             }
@@ -74,6 +73,7 @@
     local real-type = [ type.type-from-rule-name $(type) ] ;
     if ! $(real-type)
     {
+        import errors ;
         errors.user-error No type corresponds to the main target rule name
             '$(type)' : "Hint: try a lowercase name" ;
     }