From b5d272013764f5f44eba831298ee4d80dd7ea006 Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Sat, 14 Oct 2006 10:37:54 +0000
Subject: [PATCH] 	build/ 	* generators.jam (construct): Remove the
 'allowed-type' parameter. 	Adjust other files.

[SVN r35608]
---
 src/build/generators.jam | 7 +------
 src/tools/builtin.jam    | 2 +-
 src/tools/stage.jam      | 2 +-
 src/tools/stlport.jam    | 2 +-
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/build/generators.jam b/src/build/generators.jam
index e037bab77..3c7cfe365 100644
--- a/src/build/generators.jam
+++ b/src/build/generators.jam
@@ -1134,12 +1134,7 @@ local rule construct-really (
 # 'construct' in stack, returns only targets of requested 'target-type',
 # otherwise, returns also unused sources and additionally generated
 # targets.    
-#
-# Does not return target which are not of 'allowed-type' or of type derived from
-# it. If 'allowed-type' is not specified, it's defaulted to 'target-type'.
-# See lib-target-class for use case of this.
-rule construct ( project name ? : target-type : property-set * : sources * 
-   : allowed-type * )
+rule construct ( project name ? : target-type : property-set * : sources * )
 {
     if (.construct-stack)
     {
diff --git a/src/tools/builtin.jam b/src/tools/builtin.jam
index 26019df41..859f232bf 100644
--- a/src/tools/builtin.jam
+++ b/src/tools/builtin.jam
@@ -480,7 +480,7 @@ class lib-generator : generator
             property-set = [ $(property-set).add-raw <main-target-type>LIB ] ;
             # Construct the target.
             return [ generators.construct $(project) $(name) : $(actual-type) 
-              : $(property-set) : $(sources) : LIB ] ;        
+              : $(property-set) : $(sources) ] ;        
         }  
     }    
     
diff --git a/src/tools/stage.jam b/src/tools/stage.jam
index cb3806eab..ab9ea585d 100644
--- a/src/tools/stage.jam
+++ b/src/tools/stage.jam
@@ -150,7 +150,7 @@ class install-target-class : basic-target
                 else
                 {
                     local targets = [ generators.construct $(self.project) $(name) : 
-                      INSTALLED_$(t) : $(new-properties) : $(i) : * ] ;
+                      INSTALLED_$(t) : $(new-properties) : $(i) ] ;
                     staged-targets += $(targets[2-]) ;                                
                 }                                                
             }
diff --git a/src/tools/stlport.jam b/src/tools/stlport.jam
index cda3be262..ad1c1eb15 100644
--- a/src/tools/stlport.jam
+++ b/src/tools/stlport.jam
@@ -172,7 +172,7 @@ class stlport-target-class : basic-target
                     = [ targets.main-target-requirements
                         [ $(lib-file.props).raw ] <file>$(lib-file[-1])
                         : $(self.project) ] ;
-                return [ generators.construct $(self.project) $(name) : LIB : $(lib-file.requirements) : : LIB ] ;
+                return [ generators.construct $(self.project) $(name) : LIB : $(lib-file.requirements) ] ;
             }
             else
             {