diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-01-24 13:34:15 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-01-24 13:34:15 +0000 |
| commit | 680dd8393bffed8a7ebcdb9824b51b3a30c08615 (patch) | |
| tree | a1a7cecc907f4eb8c0c1f0e32a3b07501b482ed6 | |
| parent | 48dd06631be3f4010374b0e6a0b296cf0542e2cb (diff) | |
| download | ATCD-680dd8393bffed8a7ebcdb9824b51b3a30c08615.tar.gz | |
Tue Jan 24 13:33:32 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* examples/BasicSP/BMClosedED/BMClosedED_exec.cpp:
Layout changes
* rules.ciao.GNU:
Small simplification
| -rw-r--r-- | CIAO/ChangeLog | 8 | ||||
| -rw-r--r-- | CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp | 3 | ||||
| -rw-r--r-- | CIAO/rules.ciao.GNU | 10 |
3 files changed, 12 insertions, 9 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index b91d7e29a5d..2a178950c9c 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,11 @@ +Tue Jan 24 13:33:32 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> + + * examples/BasicSP/BMClosedED/BMClosedED_exec.cpp: + Layout changes + + * rules.ciao.GNU: + Small simplification + Tue Jan 24 12:05:47 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.cpp: diff --git a/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp b/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp index 9b3808d8ce4..653efe74d11 100644 --- a/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp +++ b/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp @@ -93,8 +93,7 @@ MyImpl::BMClosedED_exec_i::push_in_avail (BasicSP::DataAvailable *) // Operations from Components::SessionComponent void MyImpl::BMClosedED_exec_i::set_session_context ( - Components::SessionContext_ptr ctx - ) + Components::SessionContext_ptr ctx) { ACE_DEBUG ((LM_EMERGENCY, "MyImpl::BMClosedED_exec_i::set_session_context\n")); diff --git a/CIAO/rules.ciao.GNU b/CIAO/rules.ciao.GNU index 1a6794f01a3..446f3bd6d95 100644 --- a/CIAO/rules.ciao.GNU +++ b/CIAO/rules.ciao.GNU @@ -8,14 +8,10 @@ # #---------------------------------------------------------------------------- -ifndef TAO_ROOT - TAO_ROOT = $(ACE_ROOT)/TAO -endif - -ifndef CIAO_ROOT - CIAO_ROOT = $(TAO_ROOT)/CIAO -endif +TAO_ROOT ?= $(ACE_ROOT)/TAO +CIAO_ROOT ?= $(TAO_ROOT)/CIAO +TAO_ROOT := $(subst \,/,$(TAO_ROOT)) CIAO_ROOT := $(subst \,/,$(CIAO_ROOT)) ifndef TAO_IDL3_TO_IDL2 |