diff options
| author | edwardgt <edwardgt@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-05-05 00:48:17 +0000 |
|---|---|---|
| committer | edwardgt <edwardgt@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-05-05 00:48:17 +0000 |
| commit | 2e42a3ec867bce2f825d410e52cb301933020298 (patch) | |
| tree | 06703623294ca168d44dbadcbde9a474e27186e0 | |
| parent | 442e345c79bbd93f9727245339f9a7dfec65dac9 (diff) | |
| download | ATCD-2e42a3ec867bce2f825d410e52cb301933020298.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/CIAO/ciao/CCM_Base.idl | 6 | ||||
| -rw-r--r-- | TAO/CIAO/ciao/CCM_Core.mpc | 2 | ||||
| -rw-r--r-- | TAO/CIAO/ciao/CIAO_RTEvent.cpp | 4 | ||||
| -rw-r--r-- | TAO/CIAO/ciao/Container_Base.cpp | 2 | ||||
| -rw-r--r-- | TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc | 1 |
5 files changed, 8 insertions, 7 deletions
diff --git a/TAO/CIAO/ciao/CCM_Base.idl b/TAO/CIAO/ciao/CCM_Base.idl index e49d135152b..7c7460eed58 100644 --- a/TAO/CIAO/ciao/CCM_Base.idl +++ b/TAO/CIAO/ciao/CCM_Base.idl @@ -3,8 +3,8 @@ /** * @@ Compile this file with: * - * tao_idl -Gv -I W:/ACE_wrappers/TAO -I W:/ACE_wrappers/TAO/orbsvcs/orbsvcs Component_Base.idl - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ + * tao_idl -I W:/ACE_wrappers/TAO Component_Base.idl + * tao_idl -I ../.. \ * -Wb,export_macro=CIAO_Export \ * -Wb,export_include=CIAO_export.h \ * -Wb,pre_include="ace/pre.h" \ @@ -15,7 +15,7 @@ //#define CIAO_HAS_IMPORT_KEYWORD #if defined (CIAO_HAS_IMPORT_KEYWORD) -import ::CORBA; +// import ::CORBA; #else #include <orb.idl> #endif /* CIAO_HAS_IMPORT_KEYWORD */ diff --git a/TAO/CIAO/ciao/CCM_Core.mpc b/TAO/CIAO/ciao/CCM_Core.mpc index 27e189c738b..40b37ab6094 100644 --- a/TAO/CIAO/ciao/CCM_Core.mpc +++ b/TAO/CIAO/ciao/CCM_Core.mpc @@ -97,7 +97,7 @@ project (CIAO_Container) : orbsvcslib, portableserver, security, iorinterceptor, project (CIAO_Server) : orbsvcslib, portableserver, valuetype, ifr_client, security { after += CIAO_Container sharedname = CIAO_Server - libs += CIAO_Client + libs += CIAO_Container CIAO_Client idlflags += -Wb,export_include=CIAO_Server_Export.h -Wb,export_macro=CIAO_SERVER_Export dynamicflags = CIAO_SERVER_BUILD_DLL diff --git a/TAO/CIAO/ciao/CIAO_RTEvent.cpp b/TAO/CIAO/ciao/CIAO_RTEvent.cpp index 6b39673eda2..360cae4d27f 100644 --- a/TAO/CIAO/ciao/CIAO_RTEvent.cpp +++ b/TAO/CIAO/ciao/CIAO_RTEvent.cpp @@ -191,7 +191,7 @@ namespace CIAO CORBA::SystemException)) { - ACE_DEBUG ((LM_DEBUG, "CIAO::RTEventService::push_event\n")); + //ACE_DEBUG ((LM_DEBUG, "CIAO::RTEventService::push_event\n")); RtecEventComm::EventSet events (1); events.length (1); @@ -232,7 +232,7 @@ namespace CIAO void RTEventServiceConsumer_impl::push (const RtecEventComm::EventSet& events) { - ACE_DEBUG ((LM_DEBUG, "CIAO::RTEventServiceConsumer_impl::push\n")); + //ACE_DEBUG ((LM_DEBUG, "CIAO::RTEventServiceConsumer_impl::push\n")); for (size_t i = 0; i < events.length (); ++i) { diff --git a/TAO/CIAO/ciao/Container_Base.cpp b/TAO/CIAO/ciao/Container_Base.cpp index 859438eabea..b9614ec29b8 100644 --- a/TAO/CIAO/ciao/Container_Base.cpp +++ b/TAO/CIAO/ciao/Container_Base.cpp @@ -194,7 +194,7 @@ CIAO::Container::push_event ( CORBA::SystemException)) { - ACE_DEBUG ((LM_DEBUG, "CIAO::Container::push_event\n")); + //ACE_DEBUG ((LM_DEBUG, "CIAO::Container::push_event\n")); CIAO::EventServiceBase * event_service; // ACE_DEBUG ((LM_DEBUG, "Pushing from supplier id: %s\n", connection_id)); diff --git a/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc b/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc index 29000314edc..15deed2c5ee 100644 --- a/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc +++ b/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc @@ -19,6 +19,7 @@ project(XML_Helpers): taolib_with_idl, rtcorba, portableserver, acexml { Cascadable_DocHandler.cpp Assembly_Spec.cpp Assembly_Handlers.cpp + Event_Handlers.cpp } } |