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

Subject: [Boost-commit] svn:boost r56041 - trunk/tools/build/v2/build
From: ghost_at_[hidden]
Date: 2009-09-05 08:38:59

Author: vladimir_prus
Date: 2009-09-05 08:38:58 EDT (Sat, 05 Sep 2009)
New Revision: 56041
URL: http://svn.boost.org/trac/boost/changeset/56041

Log:
Fix feature.jam
Text files modified: 
   trunk/tools/build/v2/build/feature.jam |    32 +++++++++++++++-----------------        
   1 files changed, 15 insertions(+), 17 deletions(-)

Modified: trunk/tools/build/v2/build/feature.jam
==============================================================================
--- trunk/tools/build/v2/build/feature.jam	(original)
+++ trunk/tools/build/v2/build/feature.jam	2009-09-05 08:38:58 EDT (Sat, 05 Sep 2009)
@@ -17,19 +17,21 @@
 local rule setup ( )
 {
     .all-attributes =
-        implicit
-        composite
-        optional
-        symmetric
-        free
-        incidental
-        path
-        dependency
-        propagated
-        link-incompatible
-        subfeature
-        order-sensitive
-    ;
+
+      implicit 
+      executed 
+      composite
+      optional 
+      symmetric
+      free      
+      incidental  
+      path  
+      dependency  
+      propagated 
+      link-incompatible
+      subfeature
+      order-sensitive
+      ;
 
     .all-features = ;
     .all-subfeatures = ; # non-subfeatures
@@ -156,7 +158,6 @@
 rule set-default ( feature : value )
 {
     local f = [ grist $(feature) ] ;
-<<<<<<< .working
     local a = $($(f).attributes) ;
     local bad-attribute = ;
     if free in $(a)
@@ -172,9 +173,6 @@
         errors.error "$(bad-attribute) property $(f) cannot have a default." ;
     }
     if ! $(value) in $($(f).values)
-=======
-    if ! $(value) in $($(f).values) 
->>>>>>> .merge-right.r42493
     {
         errors.error "The specified default value, '$(value)' is invalid" 
           : "allowed values are: " $($(f).values) ;