Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r76058 - in trunk/tools/build/v2: build tools
From: steven_at_[hidden]
Date: 2011-12-18 21:24:32


Author: steven_watanabe
Date: 2011-12-18 21:24:31 EST (Sun, 18 Dec 2011)
New Revision: 76058
URL: http://svn.boost.org/trac/boost/changeset/76058

Log:
Fix a few oddly written returns. These only work because of the idiosyncracies of the Jam language.
Text files modified:
   trunk/tools/build/v2/build/targets.jam | 2 +-
   trunk/tools/build/v2/tools/python.jam | 2 +-
   trunk/tools/build/v2/tools/stage.jam | 2 +-
   3 files changed, 3 insertions(+), 3 deletions(-)

Modified: trunk/tools/build/v2/build/targets.jam
==============================================================================
--- trunk/tools/build/v2/build/targets.jam (original)
+++ trunk/tools/build/v2/build/targets.jam 2011-12-18 21:24:31 EST (Sun, 18 Dec 2011)
@@ -936,7 +936,7 @@
     {
         $(key) = [ common-properties2 $(build-request) $(non-free) ] ;
     }
- result = [ $($(key)).add-raw $(free) ] ;
+ return [ $($(key)).add-raw $(free) ] ;
 }
 
 

Modified: trunk/tools/build/v2/tools/python.jam
==============================================================================
--- trunk/tools/build/v2/tools/python.jam (original)
+++ trunk/tools/build/v2/tools/python.jam 2011-12-18 21:24:31 EST (Sun, 18 Dec 2011)
@@ -1178,7 +1178,7 @@
 
         property-set = [ $(property-set).add-raw <dependency>$(other-pythons) ] ;
 
- result = [ construct-result $(python) $(extensions) $(new-sources) :
+ return [ construct-result $(python) $(extensions) $(new-sources) :
             $(project) $(name) : $(property-set) ] ;
     }
 }

Modified: trunk/tools/build/v2/tools/stage.jam
==============================================================================
--- trunk/tools/build/v2/tools/stage.jam (original)
+++ trunk/tools/build/v2/tools/stage.jam 2011-12-18 21:24:31 EST (Sun, 18 Dec 2011)
@@ -263,7 +263,7 @@
             }
         }
         DELETE_MODULE $(result) ;
- result = [ sequence.unique $(result2) ] ;
+ return [ sequence.unique $(result2) ] ;
     }
 
     # Returns true iff 'type' is subtype of some element of 'types-to-include'.


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk