diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-07-21 13:28:05 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-07-21 13:28:05 +0000 |
| commit | 3dd35c5840f521f5ff8519330a81386d5aae8ef1 (patch) | |
| tree | 562a0b15e1389b22984d4ff499da2ce25d565f0b | |
| parent | c046ecdf56e2410af01efda38d91118f277061ad (diff) | |
| download | ATCD-3dd35c5840f521f5ff8519330a81386d5aae8ef1.tar.gz | |
ChangeLogTag: Fri Jul 21 13:27:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/config/taoidldefaults.mpb | 14 |
2 files changed, 12 insertions, 7 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 587e54c3557..5be60ed471e 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Fri Jul 21 13:27:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Connection_Timeout/Connection_Timeout.mpc: + Simplified this file + Fri Jul 21 13:24:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Bug_2503_Regression/client.cpp: diff --git a/bin/MakeProjectCreator/config/taoidldefaults.mpb b/bin/MakeProjectCreator/config/taoidldefaults.mpb index b321166bc8c..a0813a1b362 100644 --- a/bin/MakeProjectCreator/config/taoidldefaults.mpb +++ b/bin/MakeProjectCreator/config/taoidldefaults.mpb @@ -24,35 +24,35 @@ project { // Inline related options optional(inline_outputext) { - commandflags(!-SS && !-Ssi || !-Sci || -GT && !-SS) += .inl, .i + commandflags(!-SS && !-Ssi || !-Sci || -GT && !-SS && !-oS) += .inl, .i } optional(inline_pre_extension) { - commandflags(!-SS && !-Ssi) += S + commandflags(!-SS && !-Ssi && !-oS) += S } optional(inline_pre_extension) { commandflags(!-Sci) += C } optional(inline_pre_extension) { - commandflags(-GT && !-SS) += S_T + commandflags(-GT && !-SS && !-oS) += S_T } // Source related options optional(source_pre_extension) { - commandflags(!-SS) += S + commandflags(!-SS && !-oS) += S } optional(source_pre_extension) { commandflags(-GA && !-oA) += A } optional(header_outputext) { - commandflags(-SS) += S + commandflags(-SS && !-oS) += S } // Other optional(template_outputext) { - commandflags(-GT && !-SS) += S_T.cpp, S_T.cxx, S_T.cc, S_T.C + commandflags(-GT && !-SS && !-oS) += S_T.cpp, S_T.cxx, S_T.cc, S_T.C } optional(header_pre_extension) { - commandflags(-GT && !-SS) += S_T + commandflags(-GT && !-SS && !-oS) += S_T } optional(header_pre_extension) { commandflags(-GA && !-oA) += A |