diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2009-07-19 17:23:14 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2009-07-19 17:23:14 +0000 |
| commit | e7915ce3e2a687e4d42611156afb4d9e306f9602 (patch) | |
| tree | b56c9ff1b4b0aa4d0a224d7753c4100ab1fe5f8b | |
| parent | 7c766e3ff3bf24063d7a64f1d606e2dcee6c18f1 (diff) | |
| download | ATCD-e7915ce3e2a687e4d42611156afb4d9e306f9602.tar.gz | |
Sun Jul 19 17:22:08 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu>
| -rw-r--r-- | CIAO/ChangeLog | 7 | ||||
| -rw-r--r-- | CIAO/tests/IDL_Test/Keywords/Keywords.mpc | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 6f52dd1997e..529dab50c76 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,10 @@ +Sun Jul 19 17:22:08 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> + + * tests/IDL_Test/Keywords/Keywords.mpc: + + avoids mfc, as building with mfc enabled causes 'interface' + to become a language keyword, where it otherwise would not be. + Sun Jul 19 09:50:47 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * ciao/Servants/Port_Activator_T.cpp: diff --git a/CIAO/tests/IDL_Test/Keywords/Keywords.mpc b/CIAO/tests/IDL_Test/Keywords/Keywords.mpc index 98384d52c45..5778561bf53 100644 --- a/CIAO/tests/IDL_Test/Keywords/Keywords.mpc +++ b/CIAO/tests/IDL_Test/Keywords/Keywords.mpc @@ -29,6 +29,7 @@ project(Keyword_Clash_lem_gen) : ciaoidldefaults { } project(Keyword_Clash_stub) : ccm_stub { + avoids += mfc after += Keyword_Clash_idl_gen sharedname = Keyword_Clash_stub dynamicflags = KEYWORD_CLASH_STUB_BUILD_DLL @@ -51,6 +52,7 @@ project(Keyword_Clash_stub) : ccm_stub { } project(Keyword_Clash_exec) : ciao_executor { + avoids += mfc after += Keyword_Clash_lem_gen Keyword_Clash_stub sharedname = Keyword_Clash_exec libs += Keyword_Clash_stub @@ -77,6 +79,7 @@ project(Keyword_Clash_exec) : ciao_executor { } project(Keyword_Clash_svnt) : ciao_servant { + avoids += mfc after += Keyword_Clash_exec sharedname = Keyword_Clash_svnt libs += Keyword_Clash_exec \ |