|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r64552 - trunk/tools/build/v2/build
From: ghost_at_[hidden]
Date: 2010-08-02 16:23:02
Author: vladimir_prus
Date: 2010-08-02 16:23:00 EDT (Mon, 02 Aug 2010)
New Revision: 64552
URL: http://svn.boost.org/trac/boost/changeset/64552
Log:
Fix handling of derived types with empty suffix.
Text files modified:
trunk/tools/build/v2/build/type.py | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
Modified: trunk/tools/build/v2/build/type.py
==============================================================================
--- trunk/tools/build/v2/build/type.py (original)
+++ trunk/tools/build/v2/build/type.py 2010-08-02 16:23:00 EDT (Mon, 02 Aug 2010)
@@ -85,7 +85,7 @@
if len (suffixes) > 0:
# Generated targets of 'type' will use the first of 'suffixes'
- # (this may be overriden)
+ # (this may be overriden)
set_generated_target_suffix (type, [], suffixes [0])
# Specify mapping from suffixes to type
@@ -259,7 +259,7 @@
# Note that if the string is empty (""), but not null, we consider
# suffix found. Setting prefix or suffix to empty string is fine.
- if result:
+ if result is not None:
found = True
type = __types [type]['base']
@@ -273,8 +273,8 @@
with the specified properties. If not suffix were specified for
'type', returns suffix for base type, if any.
"""
- key = str(is_suffix) + type + str(prop_set)
- v = __target_suffixes_cache.get (key, None)
+ key = (is_suffix, type, prop_set)
+ v = __target_suffixes_cache.get(key, None)
if not v:
v = generated_target_ps_real(is_suffix, type, prop_set.raw())
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