diff options
Diffstat (limited to '')
-rw-r--r-- | src/target.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/target.cpp b/src/target.cpp index 4f9dd77..958fcf5 100644 --- a/src/target.cpp +++ b/src/target.cpp | |||
@@ -219,7 +219,7 @@ const VarHash &Target::getVars() const | |||
219 | 219 | ||
220 | void Target::setDisplay( const Bu::FString &sNewDisplay ) | 220 | void Target::setDisplay( const Bu::FString &sNewDisplay ) |
221 | { | 221 | { |
222 | if( !sDisplay ) | 222 | if( !sDisplay.isSet() ) |
223 | sDisplay = sNewDisplay; | 223 | sDisplay = sNewDisplay; |
224 | } | 224 | } |
225 | 225 | ||
@@ -292,7 +292,7 @@ void Target::mergeUnder( const Target *pSrc ) | |||
292 | merge( lsRequires, pSrc->lsRequires ); | 292 | merge( lsRequires, pSrc->lsRequires ); |
293 | merge( lsOutput, pSrc->lsOutput ); | 293 | merge( lsOutput, pSrc->lsOutput ); |
294 | 294 | ||
295 | if( !sPrefix ) | 295 | if( !sPrefix.isSet() ) |
296 | sPrefix = pSrc->sPrefix; | 296 | sPrefix = pSrc->sPrefix; |
297 | 297 | ||
298 | sRule = pSrc->sRule; | 298 | sRule = pSrc->sRule; |
@@ -309,7 +309,7 @@ void Target::mergeUnder( const Target *pSrc ) | |||
309 | } | 309 | } |
310 | } | 310 | } |
311 | 311 | ||
312 | if( !sDisplay ) | 312 | if( !sDisplay.isSet() ) |
313 | sDisplay = pSrc->sDisplay; | 313 | sDisplay = pSrc->sDisplay; |
314 | 314 | ||
315 | // Now we need to reset our vars. | 315 | // Now we need to reset our vars. |