summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsmit <msmit@remedy.nl>2011-12-08 14:39:46 +0000
committermsmit <msmit@remedy.nl>2011-12-08 14:39:46 +0000
commitdb7ed15276819cdd49bb283a71aa64ce1a30070b (patch)
tree4413e7ec745a90c2b2972c69a40c3efd4ab64726
parent730573f83eb46219718b2abded555e822bdddbbc (diff)
downloadATCD-db7ed15276819cdd49bb283a71aa64ce1a30070b.tar.gz
Thu Dec 8 14:38:45 UTC 2011 Marcel Smit <msmit@remedy.nl>
* ciao/Servants/Extension/Servant_Impl_T.h: Added missing include. * connectors/ami4ccm/examples/Hello/Base/Hello.mpc: Removed -Gsv IDL compiler flag.
-rw-r--r--CIAO/ChangeLog.BRANCH8
-rw-r--r--CIAO/ciao/Servants/Extension/Servant_Impl_T.h1
-rw-r--r--CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.mpc1
3 files changed, 9 insertions, 1 deletions
diff --git a/CIAO/ChangeLog.BRANCH b/CIAO/ChangeLog.BRANCH
index e925ddf0b0e..27f3060625b 100644
--- a/CIAO/ChangeLog.BRANCH
+++ b/CIAO/ChangeLog.BRANCH
@@ -1,3 +1,11 @@
+Thu Dec 8 14:38:45 UTC 2011 Marcel Smit <msmit@remedy.nl>
+
+ * ciao/Servants/Extension/Servant_Impl_T.h:
+ Added missing include.
+
+ * connectors/ami4ccm/examples/Hello/Base/Hello.mpc:
+ Removed -Gsv IDL compiler flag.
+
Wed Dec 7 07:34:23 UTC 2011 Marcel Smit <msmit@remedy.nl>
* ciao/Servants/Facet_Servant_Base_T.h:
diff --git a/CIAO/ciao/Servants/Extension/Servant_Impl_T.h b/CIAO/ciao/Servants/Extension/Servant_Impl_T.h
index 448ffba8f56..cbbe5fe97ed 100644
--- a/CIAO/ciao/Servants/Extension/Servant_Impl_T.h
+++ b/CIAO/ciao/Servants/Extension/Servant_Impl_T.h
@@ -25,6 +25,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+#include "ciao/Containers/Extension/Extension_Container.h"
#include "ccm/Extension/CCM_ExtensionComponentC.h"
namespace CIAO
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.mpc b/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.mpc
index e6e41e8c1b8..4c8c5db8265 100644
--- a/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.mpc
+++ b/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.mpc
@@ -11,7 +11,6 @@ project(AMI_Hello_idl_gen) : componentidldefaults, ami, ami4ccm_stub {
-Wb,exec_export_macro=HELLO_EXEC_Export \
-Wb,exec_export_include=Hello_exec_export.h \
-I.. -GM -Gxhcn
- idlflags -= -Gsv
IDL_Files {
Hello.idl