summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2010-03-01 19:40:40 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2010-03-01 19:40:40 +0000
commit00a7ef578c8edaafbdebbc98423c4595097f395b (patch)
tree966aa3bb4723704abd46286402a712ee472d4bc8
parent34a3138a2a57ea81c28bb9c82c3b620cdca889c0 (diff)
downloadATCD-00a7ef578c8edaafbdebbc98423c4595097f395b.tar.gz
ChangeLogTag: Mon Mar 1 19:38:29 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>
-rw-r--r--CIAO/ChangeLog10
-rw-r--r--CIAO/ccm/CCM.mpc4
2 files changed, 12 insertions, 2 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index bfe175f2af2..c713c53ff81 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,13 @@
+Mon Mar 1 19:38:29 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>
+
+ * ccm/CCM.mpc:
+
+ Removed the application of the -Ssi IDL compiler option to
+ Navigation.idl and Receptacles.idl, so that their direct
+ collocation related code can be compiled for a specialized
+ build that tests the direct collocation code generation
+ option.
+
Mon Mar 1 10:00:54 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/impl/ndds/DataReaderListener_T.h:
diff --git a/CIAO/ccm/CCM.mpc b/CIAO/ccm/CCM.mpc
index 99a5296f72c..0a327601fb3 100644
--- a/CIAO/ccm/CCM.mpc
+++ b/CIAO/ccm/CCM.mpc
@@ -38,11 +38,11 @@ project(CCM_stub_idl) : ciaolib_with_idl, valuetype {
CCM_HomeFinder.idl
CCM_Configurator.idl
CCM_KeylessCCMHome.idl
- CCM_Navigation.idl
- CCM_Receptacle.idl
}
IDL_Files {
+ CCM_Navigation.idl
+ CCM_Receptacle.idl
CCM_Events.idl
CCM_EventBase.idl
CCM_EventConsumerBase.idl