diff options
74 files changed, 299 insertions, 219 deletions
diff --git a/TAO/DevGuideExamples/AMH/amh_pch.h b/TAO/DevGuideExamples/AMH/amh_pch.h index a86451d29c8..fe6d2628083 100644 --- a/TAO/DevGuideExamples/AMH/amh_pch.h +++ b/TAO/DevGuideExamples/AMH/amh_pch.h @@ -4,9 +4,9 @@ #define PCH_H #ifdef USING_PCH -#include <tao/corba.h> -#include <tao/ORB_Core.h> -#include <tao/Stub.h> +#include "tao/corba.h" +#include "tao/ORB_Core.h" +#include "tao/Stub.h" #endif #endif diff --git a/TAO/DevGuideExamples/AMH_AMI/amh_ami_pch.h b/TAO/DevGuideExamples/AMH_AMI/amh_ami_pch.h index a86451d29c8..fe6d2628083 100644 --- a/TAO/DevGuideExamples/AMH_AMI/amh_ami_pch.h +++ b/TAO/DevGuideExamples/AMH_AMI/amh_ami_pch.h @@ -4,9 +4,9 @@ #define PCH_H #ifdef USING_PCH -#include <tao/corba.h> -#include <tao/ORB_Core.h> -#include <tao/Stub.h> +#include "tao/corba.h" +#include "tao/ORB_Core.h" +#include "tao/Stub.h" #endif #endif diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp index 08bad647881..b5b029d3ff6 100644 --- a/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp +++ b/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp @@ -7,7 +7,7 @@ #include "ace/Get_Opt.h" #include "ace/Argv_Type_Converter.h" -#include <tao/BiDir_GIOP/BiDirGIOP.h> +#include "tao/BiDir_GIOP/BiDirGIOP.h" #include <iostream> diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp index 15730840494..5868a122c32 100644 --- a/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp +++ b/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp @@ -7,7 +7,7 @@ #include "ace/Get_Opt.h" #include "ace/Argv_Type_Converter.h" -#include <tao/BiDir_GIOP/BiDirGIOP.h> +#include "tao/BiDir_GIOP/BiDirGIOP.h" #include <iostream> #include <fstream> diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp index 2659898d8d7..ed01838377c 100644 --- a/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp +++ b/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp @@ -4,9 +4,9 @@ #include "simple_i.h" -#include <tao/ORB_Core.h> -#include <tao/Transport_Cache_Manager.h> -#include <tao/Thread_Lane_Resources.h> +#include "tao/ORB_Core.h" +#include "tao/Transport_Cache_Manager.h" +#include "tao/Thread_Lane_Resources.h" #include <iostream> diff --git a/TAO/DevGuideExamples/ChangeLog b/TAO/DevGuideExamples/ChangeLog index 5f09132ee87..ebd1a314de3 100644 --- a/TAO/DevGuideExamples/ChangeLog +++ b/TAO/DevGuideExamples/ChangeLog @@ -1,3 +1,83 @@ +Wed Oct 22 15:56:27 UTC 2008 Abdullah Sowayan <abdullah.sowayan@lmco.com> + + * AMH/amh_pch.h: + * AMH_AMI/amh_ami_pch.h: + * BiDirectionalGIOP/client.cpp: + * BiDirectionalGIOP/server.cpp: + * BiDirectionalGIOP/simple_i.cpp: + * EventServices/OMG_Basic/EchoEventConsumer_i.cpp: + * EventServices/OMG_SupplierSideEC/EchoEventConsumer_i.cpp: + * EventServices/OMG_TypedEC/ConsumerMain.cpp: + * EventServices/OMG_TypedEC/Consumer_i.cpp: + * EventServices/OMG_TypedEC/SupplierMain.cpp: + * EventServices/RTEC_Basic/EchoEventConsumer_i.cpp: + * EventServices/RTEC_Basic/EchoEventSupplier_i.cpp: + * EventServices/RTEC_Federated/EchoEventConsumer_i.cpp: + * EventServices/RTEC_Federated/EchoEventSupplier_i.cpp: + * EventServices/RTEC_Filter/EchoEventConsumer_i.cpp: + * EventServices/RTEC_Filter/EchoEventSupplier_i.cpp: + * EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.cpp: + * EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp: + * EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.cpp: + * GettingStarted/started_pch.h: + * ImplRepo/IORTable/MessengerServer.cpp: + * ImplRepo/MessengerServer.cpp: + * InterfaceRepo/IFRBrowser.cpp: + * LocalObjects/Messenger/Messenger_i.h: + * LocalObjects/ServantLocator/MessengerServer.cpp: + * Messaging/RelativeRoundtripTimeout/MessengerClient.cpp: + * Multithreading/GracefulShutdown/MessengerServer.cpp: + * Multithreading/GracefulShutdown/MessengerShutdownTimer.h: + * NamingService/Naming_Server/MessengerTask.h: + * NamingService/Naming_Server/NamingTask.h: + * NotifyService/EventSequence/EventSequenceConsumer_i.cpp: + * NotifyService/EventSequence/EventSequenceSupplier_i.cpp: + * NotifyService/Filtering/StructuredEventConsumer_i.cpp: + * NotifyService/Filtering/StructuredEventSupplier_i.cpp: + * NotifyService/Messenger/StructuredEventConsumer_i.cpp: + * NotifyService/Messenger/StructuredEventSupplier_i.cpp: + * NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp: + * NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp: + * NotifyService/QoSProperties/StructuredEventConsumer_i.cpp: + * NotifyService/QoSProperties/StructuredEventSupplier_i.cpp: + * NotifyService/RTNotify/StructuredEventConsumer_i.cpp: + * NotifyService/RTNotify/StructuredEventSupplier_i.cpp: + * NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp: + * NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp: + * PortableInterceptors/Auth/ClientInterceptor.h: + * PortableInterceptors/Auth/ClientInterceptor.cpp: + * PortableInterceptors/Auth/MessengerClient.cpp: + * PortableInterceptors/Auth/MessengerServer.cpp: + * PortableInterceptors/Auth/ServerInterceptor.cpp: + * PortableInterceptors/IOR/MessengerClient.cpp: + * PortableInterceptors/IOR/MessengerServer.cpp: + * PortableInterceptors/IOR/Messenger_i.cpp: + * PortableInterceptors/IOR/ServerInterceptor.cpp: + * PortableInterceptors/PICurrent/MessengerClient.cpp: + * PortableInterceptors/PICurrent/MessengerServer.cpp: + * PortableInterceptors/PICurrent_NameService/MessengerClient.cpp: + * PortableInterceptors/PICurrent_NameService/MessengerServer.cpp: + * PortableInterceptors/SimpleCodec/MessengerClient.cpp: + * PortableInterceptors/SimpleCodec/MessengerServer.cpp: + * PortableInterceptors/SimpleCodec/Messenger_i.cpp: + * PortableInterceptors/SimpleCodec/ServerInterceptor.cpp: + * RTCORBA/MessengerClient.cpp: + * RTCORBA/MessengerServer.cpp: + * RTCORBA/Messenger_i.h: + * RTCORBA/common.h: + * ValueTypes/Bank/_pch.h: + * ValueTypes/Bank/server.cpp: + * ValueTypes/Messenger/Message_i.h: + * ValueTypes/Messenger/Message_i.cpp: + * ValueTypes/Messenger/_pch.h: + * ValueTypes/Notify/Event_i.h: + * ValueTypes/Notify/consumer.cpp: + * ValueTypes/Notify/supplier.cpp: + + Fixed fuzz errors. When including files from ACE/TAO/CIAO, use "" instead of <>. + + Example: #include <ace/OS.h> was changed to "ace/OS.h" + Wed Oct 22 15:42:56 UTC 2008 Abdullah Sowayan <abdullah.sowayan@lmco.com> * AMH_AMI/inner_i.cpp: diff --git a/TAO/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumer_i.cpp b/TAO/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumer_i.cpp index 3b26c39ccb1..e586269cfd7 100644 --- a/TAO/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumer_i.cpp +++ b/TAO/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumer_i.cpp @@ -3,7 +3,7 @@ // Implements a PushConsumer. #include "EchoEventConsumer_i.h" -#include <tao/PortableServer/PS_CurrentC.h> +#include "tao/PortableServer/PS_CurrentC.h" #include <iostream> EchoEventConsumer_i::EchoEventConsumer_i( diff --git a/TAO/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumer_i.cpp b/TAO/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumer_i.cpp index 3b26c39ccb1..e586269cfd7 100644 --- a/TAO/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumer_i.cpp +++ b/TAO/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumer_i.cpp @@ -3,7 +3,7 @@ // Implements a PushConsumer. #include "EchoEventConsumer_i.h" -#include <tao/PortableServer/PS_CurrentC.h> +#include "tao/PortableServer/PS_CurrentC.h" #include <iostream> EchoEventConsumer_i::EchoEventConsumer_i( diff --git a/TAO/DevGuideExamples/EventServices/OMG_TypedEC/ConsumerMain.cpp b/TAO/DevGuideExamples/EventServices/OMG_TypedEC/ConsumerMain.cpp index 432a93d7299..e6cf5fbb445 100644 --- a/TAO/DevGuideExamples/EventServices/OMG_TypedEC/ConsumerMain.cpp +++ b/TAO/DevGuideExamples/EventServices/OMG_TypedEC/ConsumerMain.cpp @@ -10,7 +10,7 @@ #include <orbsvcs/CosTypedEventCommC.h> #include <orbsvcs/CosTypedEventChannelAdminC.h> #include <orbsvcs/CosNamingC.h> -#include <tao/AnyTypeCode/TypeCode.h> +#include "tao/AnyTypeCode/TypeCode.h" #include "ace/OS_NS_stdio.h" #include <iostream> diff --git a/TAO/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.cpp b/TAO/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.cpp index f03c672f988..4d6ea9515a0 100644 --- a/TAO/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.cpp +++ b/TAO/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.cpp @@ -3,7 +3,7 @@ // Implements a PushConsumer. #include "Consumer_i.h" -#include <tao/PortableServer/PS_CurrentC.h> +#include "tao/PortableServer/PS_CurrentC.h" #include <iostream> Consumer_i::Consumer_i(CORBA::ORB_ptr orb, diff --git a/TAO/DevGuideExamples/EventServices/OMG_TypedEC/SupplierMain.cpp b/TAO/DevGuideExamples/EventServices/OMG_TypedEC/SupplierMain.cpp index 7995521336f..49e89778f9c 100644 --- a/TAO/DevGuideExamples/EventServices/OMG_TypedEC/SupplierMain.cpp +++ b/TAO/DevGuideExamples/EventServices/OMG_TypedEC/SupplierMain.cpp @@ -5,7 +5,7 @@ #include <orbsvcs/CosTypedEventCommC.h> #include <orbsvcs/CosTypedEventChannelAdminC.h> #include <orbsvcs/CosNamingC.h> -#include <tao/AnyTypeCode/TypeCode.h> +#include "tao/AnyTypeCode/TypeCode.h" #include <iostream> #include "MessengerC.h" diff --git a/TAO/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.cpp b/TAO/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.cpp index ca3740232be..083875fe173 100644 --- a/TAO/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.cpp +++ b/TAO/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.cpp @@ -4,7 +4,7 @@ // Implements a PushConsumer. #include "EchoEventConsumer_i.h" -#include <tao/PortableServer/PS_CurrentC.h> +#include "tao/PortableServer/PS_CurrentC.h" #include "ace/OS_NS_stdio.h" #include <sstream> diff --git a/TAO/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.cpp b/TAO/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.cpp index cc334152252..647b2545ef1 100644 --- a/TAO/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.cpp +++ b/TAO/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.cpp @@ -4,7 +4,7 @@ // Implements a PushSupplier. #include "EchoEventSupplier_i.h" -#include <tao/PortableServer/PS_CurrentC.h> +#include "tao/PortableServer/PS_CurrentC.h" // Constructor duplicates the ORB reference. EchoEventSupplier_i::EchoEventSupplier_i(CORBA::ORB_ptr orb) diff --git a/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.cpp b/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.cpp index ca3740232be..083875fe173 100644 --- a/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.cpp +++ b/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.cpp @@ -4,7 +4,7 @@ // Implements a PushConsumer. #include "EchoEventConsumer_i.h" -#include <tao/PortableServer/PS_CurrentC.h> +#include "tao/PortableServer/PS_CurrentC.h" #include "ace/OS_NS_stdio.h" #include <sstream> diff --git a/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.cpp b/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.cpp index cc334152252..647b2545ef1 100644 --- a/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.cpp +++ b/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.cpp @@ -4,7 +4,7 @@ // Implements a PushSupplier. #include "EchoEventSupplier_i.h" -#include <tao/PortableServer/PS_CurrentC.h> +#include "tao/PortableServer/PS_CurrentC.h" // Constructor duplicates the ORB reference. EchoEventSupplier_i::EchoEventSupplier_i(CORBA::ORB_ptr orb) diff --git a/TAO/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.cpp b/TAO/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.cpp index ca3740232be..083875fe173 100644 --- a/TAO/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.cpp +++ b/TAO/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.cpp @@ -4,7 +4,7 @@ // Implements a PushConsumer. #include "EchoEventConsumer_i.h" -#include <tao/PortableServer/PS_CurrentC.h> +#include "tao/PortableServer/PS_CurrentC.h" #include "ace/OS_NS_stdio.h" #include <sstream> diff --git a/TAO/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp b/TAO/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp index c8f3a278431..70271836d2e 100644 --- a/TAO/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp +++ b/TAO/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp @@ -4,7 +4,7 @@ // Implements a PushSupplier. #include "EchoEventSupplier_i.h" -#include <tao/PortableServer/PS_CurrentC.h> +#include "tao/PortableServer/PS_CurrentC.h" // Constructor duplicates the ORB reference. EchoEventSupplier_i::EchoEventSupplier_i(CORBA::ORB_ptr orb) @@ -16,7 +16,7 @@ EchoEventSupplier_i::EchoEventSupplier_i(CORBA::ORB_ptr orb) // Override the disconnect_push_Supplier() operation. void EchoEventSupplier_i::disconnect_push_supplier() { - + // Deactivate this object. CORBA::Object_var obj = orb_->resolve_initial_references("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow(obj.in()); diff --git a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.cpp b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.cpp index ca3740232be..083875fe173 100644 --- a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.cpp +++ b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.cpp @@ -4,7 +4,7 @@ // Implements a PushConsumer. #include "EchoEventConsumer_i.h" -#include <tao/PortableServer/PS_CurrentC.h> +#include "tao/PortableServer/PS_CurrentC.h" #include "ace/OS_NS_stdio.h" #include <sstream> diff --git a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp index 85ab0092dfc..37d03869a4f 100644 --- a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp +++ b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp @@ -19,7 +19,7 @@ #include <orbsvcs/Event/ECG_UDP_Out_Endpoint.h> #include <orbsvcs/Event/ECG_UDP_EH.h> -#include <tao/ORB_Core.h> +#include "tao/ORB_Core.h" #include "ace/Auto_Ptr.h" #include <iostream> diff --git a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.cpp b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.cpp index cc334152252..647b2545ef1 100644 --- a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.cpp +++ b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.cpp @@ -4,7 +4,7 @@ // Implements a PushSupplier. #include "EchoEventSupplier_i.h" -#include <tao/PortableServer/PS_CurrentC.h> +#include "tao/PortableServer/PS_CurrentC.h" // Constructor duplicates the ORB reference. EchoEventSupplier_i::EchoEventSupplier_i(CORBA::ORB_ptr orb) diff --git a/TAO/DevGuideExamples/GettingStarted/started_pch.h b/TAO/DevGuideExamples/GettingStarted/started_pch.h index a86451d29c8..fe6d2628083 100644 --- a/TAO/DevGuideExamples/GettingStarted/started_pch.h +++ b/TAO/DevGuideExamples/GettingStarted/started_pch.h @@ -4,9 +4,9 @@ #define PCH_H #ifdef USING_PCH -#include <tao/corba.h> -#include <tao/ORB_Core.h> -#include <tao/Stub.h> +#include "tao/corba.h" +#include "tao/ORB_Core.h" +#include "tao/Stub.h" #endif #endif diff --git a/TAO/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp b/TAO/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp index d44417d26aa..5abbd2fc6db 100644 --- a/TAO/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp +++ b/TAO/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp @@ -1,8 +1,8 @@ // $Id$ #include "Messenger_i.h" -#include <tao/PortableServer/Root_POA.h> -#include <tao/IORTable/IORTable.h> +#include "tao/PortableServer/Root_POA.h" +#include "tao/IORTable/IORTable.h" #include <iostream> #include <fstream> #include <fstream> diff --git a/TAO/DevGuideExamples/ImplRepo/MessengerServer.cpp b/TAO/DevGuideExamples/ImplRepo/MessengerServer.cpp index e86b7768542..6e6e804a2ca 100644 --- a/TAO/DevGuideExamples/ImplRepo/MessengerServer.cpp +++ b/TAO/DevGuideExamples/ImplRepo/MessengerServer.cpp @@ -4,8 +4,8 @@ // This version uses the Implementation Repository. #include "Messenger_i.h" -#include <tao/IORTable/IORTable.h> -#include <tao/PortableServer/Root_POA.h> +#include "tao/IORTable/IORTable.h" +#include "tao/PortableServer/Root_POA.h" #include <iostream> PortableServer::POA_ptr diff --git a/TAO/DevGuideExamples/InterfaceRepo/IFRBrowser.cpp b/TAO/DevGuideExamples/InterfaceRepo/IFRBrowser.cpp index d135f880298..944aef0f190 100644 --- a/TAO/DevGuideExamples/InterfaceRepo/IFRBrowser.cpp +++ b/TAO/DevGuideExamples/InterfaceRepo/IFRBrowser.cpp @@ -7,8 +7,8 @@ // browser, very rudimentary // -#include <tao/IFR_Client/IFR_BasicC.h> -#include <tao/ORB.h> +#include "tao/IFR_Client/IFR_BasicC.h" +#include "tao/ORB.h" #include "ace/Log_Msg.h" #include <iostream> diff --git a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h index f20136baf19..e2ff3c5d1cd 100644 --- a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h +++ b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h @@ -4,7 +4,7 @@ #define MESSENGERI_H_ #include "MessengerS.h" -#include <tao/LocalObject.h> +#include "tao/LocalObject.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once @@ -15,12 +15,12 @@ class Messenger_i : public virtual Messenger, public virtual TAO_Local_RefCounted_Object { public: - //Constructor + //Constructor Messenger_i (void); - - //Destructor + + //Destructor virtual ~Messenger_i (void); - + virtual CORBA::Boolean send_message ( const char * user_name, const char * subject, diff --git a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerServer.cpp b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerServer.cpp index 59e97c70cdb..8d32b9298bd 100644 --- a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerServer.cpp +++ b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerServer.cpp @@ -3,7 +3,7 @@ #include "MessengerLocator_i.h" #include "MessengerC.h" -#include <tao/AnyTypeCode/TypeCode.h> +#include "tao/AnyTypeCode/TypeCode.h" #include <iostream> #include <fstream> int ACE_TMAIN (int argc, ACE_TCHAR *argv []) diff --git a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerClient.cpp b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerClient.cpp index 35852b67e7f..ce7f6f0019c 100644 --- a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerClient.cpp +++ b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerClient.cpp @@ -1,7 +1,7 @@ // $Id$ #include "MessengerC.h" -#include <tao/TimeBaseC.h> +#include "tao/TimeBaseC.h" #include "tao/Messaging/Messaging.h" #include <iostream> int ACE_TMAIN(int argc, ACE_TCHAR * argv[]) diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp index 0225f1d68f2..644268be083 100644 --- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp +++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp @@ -6,7 +6,7 @@ #include "ace/Get_Opt.h" #include "ace/Argv_Type_Converter.h" #include "ace/Reactor.h" -#include <tao/ORB_Core.h> +#include "tao/ORB_Core.h" #include <iostream> #include <fstream> diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerShutdownTimer.h b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerShutdownTimer.h index dd40859893a..ae0cb97e37d 100644 --- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerShutdownTimer.h +++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerShutdownTimer.h @@ -4,7 +4,7 @@ #define MESSENGERSHUTDOWNTIMER_H_ #include "ace/Event_Handler.h" -#include <tao/corba.h> +#include "tao/corba.h" class MessengerShutdownTimer : public ACE_Event_Handler { diff --git a/TAO/DevGuideExamples/NamingService/Naming_Server/MessengerTask.h b/TAO/DevGuideExamples/NamingService/Naming_Server/MessengerTask.h index 92c9c45de49..bc5cdebca15 100644 --- a/TAO/DevGuideExamples/NamingService/Naming_Server/MessengerTask.h +++ b/TAO/DevGuideExamples/NamingService/Naming_Server/MessengerTask.h @@ -3,7 +3,7 @@ #ifndef MESSENGERTASK_H #define MESSENGERTASK_H -#include <tao/corba.h> +#include "tao/corba.h" #include "ace/Task.h" class MessengerTask : public ACE_Task_Base diff --git a/TAO/DevGuideExamples/NamingService/Naming_Server/NamingTask.h b/TAO/DevGuideExamples/NamingService/Naming_Server/NamingTask.h index ce3449b7fc6..5eb20293403 100644 --- a/TAO/DevGuideExamples/NamingService/Naming_Server/NamingTask.h +++ b/TAO/DevGuideExamples/NamingService/Naming_Server/NamingTask.h @@ -3,7 +3,7 @@ #ifndef NAMINGTASK_H #define NAMINGTASK_H -#include <tao/corba.h> +#include "tao/corba.h" #include "ace/Task.h" class NamingTask : public ACE_Task<ACE_MT_SYNCH> diff --git a/TAO/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp b/TAO/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp index 023c7bc0fae..90be87592af 100644 --- a/TAO/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp +++ b/TAO/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp @@ -1,7 +1,7 @@ // $Id$ #include "EventSequenceConsumer_i.h" -#include <tao/PortableServer/PS_CurrentC.h> +#include "tao/PortableServer/PS_CurrentC.h" #include <iostream> EventSequenceConsumer_i::EventSequenceConsumer_i(CORBA::ORB_ptr orb) @@ -9,35 +9,35 @@ EventSequenceConsumer_i::EventSequenceConsumer_i(CORBA::ORB_ptr orb) { } -void +void EventSequenceConsumer_i::push_structured_events ( - const CosNotification::EventBatch& events + const CosNotification::EventBatch& events ) { - + std::cout << "events received " << std::endl; - + const char* value = 0; - + for (unsigned int n = 0; n < events.length(); ++n) { for (unsigned int i = 0; i < events[n].filterable_data.length(); ++i) { events[n].filterable_data[i].value >>= value; - std::cout << events[n].filterable_data[i].name.in() << "\t" << value << std::endl; + std::cout << events[n].filterable_data[i].name.in() << "\t" << value << std::endl; } } } -void +void EventSequenceConsumer_i::disconnect_sequence_push_consumer () { - + CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id(); poa->deactivate_object(objectId.in()); - + } void diff --git a/TAO/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp b/TAO/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp index d97dbc3eb4e..4bd0dee0204 100644 --- a/TAO/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp +++ b/TAO/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp @@ -1,7 +1,7 @@ // $Id$ #include "EventSequenceSupplier_i.h" -#include <tao/PortableServer/PS_CurrentC.h> +#include "tao/PortableServer/PS_CurrentC.h" EventSequenceSupplier_i::EventSequenceSupplier_i(CORBA::ORB_ptr orb) : orb_(CORBA::ORB::_duplicate(orb)) @@ -13,7 +13,7 @@ EventSequenceSupplier_i::disconnect_sequence_push_supplier () { CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); - PortableServer::Current_var current = + PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); @@ -24,8 +24,8 @@ EventSequenceSupplier_i::disconnect_sequence_push_supplier () void EventSequenceSupplier_i::subscription_change ( const CosNotification::EventTypeSeq &, - const CosNotification::EventTypeSeq & + const CosNotification::EventTypeSeq & ) { -} +} diff --git a/TAO/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp b/TAO/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp index 1680f717662..bcf2f8ceeaf 100644 --- a/TAO/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp +++ b/TAO/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp @@ -1,7 +1,7 @@ // $Id$ #include "StructuredEventConsumer_i.h" -#include <tao/PortableServer/PS_CurrentC.h> +#include "tao/PortableServer/PS_CurrentC.h" #include <iostream> StructuredEventConsumer_i::StructuredEventConsumer_i(CORBA::ORB_ptr orb) @@ -9,23 +9,23 @@ StructuredEventConsumer_i::StructuredEventConsumer_i(CORBA::ORB_ptr orb) { } -void +void StructuredEventConsumer_i::push_structured_event( const CosNotification::StructuredEvent &event ) { - const char *value; + const char *value; - for (unsigned int i=0; i<event.filterable_data.length(); i++) { + for (unsigned int i=0; i<event.filterable_data.length(); i++) { event.filterable_data[i].value >>= value; std::cout << event.filterable_data[i].name << "\t" <<value<< std::endl; - } + } - std::cerr << "MessengerConsumer: success" << std::endl; + std::cerr << "MessengerConsumer: success" << std::endl; } -void +void StructuredEventConsumer_i::disconnect_structured_push_consumer( ) { @@ -36,14 +36,14 @@ StructuredEventConsumer_i::disconnect_structured_push_consumer( PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - + } void StructuredEventConsumer_i::offer_change( - const CosNotification::EventTypeSeq &, + const CosNotification::EventTypeSeq &, const CosNotification::EventTypeSeq & ) { //Noop -} +} diff --git a/TAO/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp b/TAO/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp index 0180d5a5669..4d086d17e7e 100644 --- a/TAO/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp +++ b/TAO/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp @@ -1,7 +1,7 @@ // $Id$ #include "StructuredEventSupplier_i.h" -#include <tao/PortableServer/PS_CurrentC.h> +#include "tao/PortableServer/PS_CurrentC.h" StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb) : orb_(CORBA::ORB::_duplicate(orb)) @@ -11,19 +11,19 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb) void StructuredEventSupplier_i::disconnect_structured_push_supplier () { - + CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); - PortableServer::Current_var current = + PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - + } void StructuredEventSupplier_i::subscription_change ( - const CosNotification::EventTypeSeq &, + const CosNotification::EventTypeSeq &, const CosNotification::EventTypeSeq &) { -} +} diff --git a/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp b/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp index 9db5dde03bc..74c54474e14 100644 --- a/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp +++ b/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp @@ -1,7 +1,7 @@ // $Id$ #include "StructuredEventConsumer_i.h" -#include <tao/PortableServer/PS_CurrentC.h> +#include "tao/PortableServer/PS_CurrentC.h" #include <iostream> StructuredEventConsumer_i::StructuredEventConsumer_i(CORBA::ORB_ptr orb) @@ -9,7 +9,7 @@ StructuredEventConsumer_i::StructuredEventConsumer_i(CORBA::ORB_ptr orb) { } -void +void StructuredEventConsumer_i::push_structured_event( const CosNotification::StructuredEvent &event ) @@ -18,15 +18,15 @@ StructuredEventConsumer_i::push_structured_event( std::cout << "event received " << std::endl; const char *value; - + for (unsigned int i=0; i<event.filterable_data.length(); i++) { event.filterable_data[i].value >>= value; - std::cout << event.filterable_data[i].name.in() << "\t" << value << std::endl; + std::cout << event.filterable_data[i].name.in() << "\t" << value << std::endl; } } -void +void StructuredEventConsumer_i::disconnect_structured_push_consumer() { @@ -41,8 +41,8 @@ StructuredEventConsumer_i::disconnect_structured_push_consumer() void StructuredEventConsumer_i::offer_change( - const CosNotification::EventTypeSeq &, + const CosNotification::EventTypeSeq &, const CosNotification::EventTypeSeq & ) { -} +} diff --git a/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp b/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp index cafef802cb6..18fd224aa8e 100644 --- a/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp +++ b/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp @@ -1,7 +1,7 @@ // $Id$ #include "StructuredEventSupplier_i.h" -#include <tao/PortableServer/PS_CurrentC.h> +#include "tao/PortableServer/PS_CurrentC.h" StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb) : orb_(CORBA::ORB::_duplicate(orb)) @@ -13,7 +13,7 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier () { CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); - PortableServer::Current_var current = + PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); @@ -23,9 +23,9 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier () void StructuredEventSupplier_i::subscription_change ( - const CosNotification::EventTypeSeq &, + const CosNotification::EventTypeSeq &, const CosNotification::EventTypeSeq & ) { -} +} diff --git a/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp b/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp index b56120524e4..684122ac49f 100644 --- a/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp +++ b/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp @@ -1,7 +1,7 @@ // $Id$ #include "StructuredEventConsumer_i.h" -#include <tao/PortableServer/PS_CurrentC.h> +#include "tao/PortableServer/PS_CurrentC.h" #include <iostream> StructuredEventConsumer_i::StructuredEventConsumer_i(CORBA::ORB_ptr orb) @@ -9,7 +9,7 @@ StructuredEventConsumer_i::StructuredEventConsumer_i(CORBA::ORB_ptr orb) { } -void +void StructuredEventConsumer_i::push_structured_event( const CosNotification::StructuredEvent &event ) @@ -19,12 +19,12 @@ StructuredEventConsumer_i::push_structured_event( for (unsigned int i=0; i<event.filterable_data.length(); i++) { event.filterable_data[i].value >>= value; - std::cout << event.filterable_data[i].name << "\t" <<value<< std::endl; + std::cout << event.filterable_data[i].name << "\t" <<value<< std::endl; } } -void +void StructuredEventConsumer_i::disconnect_structured_push_consumer( ) { @@ -35,13 +35,13 @@ StructuredEventConsumer_i::disconnect_structured_push_consumer( PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - + } void StructuredEventConsumer_i::offer_change( - const CosNotification::EventTypeSeq &, + const CosNotification::EventTypeSeq &, const CosNotification::EventTypeSeq & ) { -} +} diff --git a/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp b/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp index ead6306ba03..e6cf9911d12 100644 --- a/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp +++ b/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp @@ -1,7 +1,7 @@ // $Id$ #include "StructuredEventSupplier_i.h" -#include <tao/PortableServer/PS_CurrentC.h> +#include "tao/PortableServer/PS_CurrentC.h" StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb) : orb_(CORBA::ORB::_duplicate(orb)) @@ -13,7 +13,7 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier () { CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); - PortableServer::Current_var current = + PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); @@ -23,7 +23,7 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier () void StructuredEventSupplier_i::subscription_change ( - const CosNotification::EventTypeSeq &, + const CosNotification::EventTypeSeq &, const CosNotification::EventTypeSeq &) { -} +} diff --git a/TAO/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp b/TAO/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp index 41d84e7cc33..74c54474e14 100644 --- a/TAO/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp +++ b/TAO/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp @@ -1,7 +1,7 @@ // $Id$ #include "StructuredEventConsumer_i.h" -#include <tao/PortableServer/PS_CurrentC.h> +#include "tao/PortableServer/PS_CurrentC.h" #include <iostream> StructuredEventConsumer_i::StructuredEventConsumer_i(CORBA::ORB_ptr orb) @@ -9,7 +9,7 @@ StructuredEventConsumer_i::StructuredEventConsumer_i(CORBA::ORB_ptr orb) { } -void +void StructuredEventConsumer_i::push_structured_event( const CosNotification::StructuredEvent &event ) @@ -18,15 +18,15 @@ StructuredEventConsumer_i::push_structured_event( std::cout << "event received " << std::endl; const char *value; - + for (unsigned int i=0; i<event.filterable_data.length(); i++) { event.filterable_data[i].value >>= value; - std::cout << event.filterable_data[i].name.in() << "\t" << value << std::endl; + std::cout << event.filterable_data[i].name.in() << "\t" << value << std::endl; } } -void +void StructuredEventConsumer_i::disconnect_structured_push_consumer() { @@ -45,4 +45,4 @@ StructuredEventConsumer_i::offer_change( const CosNotification::EventTypeSeq & ) { -} +} diff --git a/TAO/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp b/TAO/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp index cafef802cb6..18fd224aa8e 100644 --- a/TAO/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp +++ b/TAO/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp @@ -1,7 +1,7 @@ // $Id$ #include "StructuredEventSupplier_i.h" -#include <tao/PortableServer/PS_CurrentC.h> +#include "tao/PortableServer/PS_CurrentC.h" StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb) : orb_(CORBA::ORB::_duplicate(orb)) @@ -13,7 +13,7 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier () { CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); - PortableServer::Current_var current = + PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); @@ -23,9 +23,9 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier () void StructuredEventSupplier_i::subscription_change ( - const CosNotification::EventTypeSeq &, + const CosNotification::EventTypeSeq &, const CosNotification::EventTypeSeq & ) { -} +} diff --git a/TAO/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp b/TAO/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp index 9db5dde03bc..74c54474e14 100644 --- a/TAO/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp +++ b/TAO/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp @@ -1,7 +1,7 @@ // $Id$ #include "StructuredEventConsumer_i.h" -#include <tao/PortableServer/PS_CurrentC.h> +#include "tao/PortableServer/PS_CurrentC.h" #include <iostream> StructuredEventConsumer_i::StructuredEventConsumer_i(CORBA::ORB_ptr orb) @@ -9,7 +9,7 @@ StructuredEventConsumer_i::StructuredEventConsumer_i(CORBA::ORB_ptr orb) { } -void +void StructuredEventConsumer_i::push_structured_event( const CosNotification::StructuredEvent &event ) @@ -18,15 +18,15 @@ StructuredEventConsumer_i::push_structured_event( std::cout << "event received " << std::endl; const char *value; - + for (unsigned int i=0; i<event.filterable_data.length(); i++) { event.filterable_data[i].value >>= value; - std::cout << event.filterable_data[i].name.in() << "\t" << value << std::endl; + std::cout << event.filterable_data[i].name.in() << "\t" << value << std::endl; } } -void +void StructuredEventConsumer_i::disconnect_structured_push_consumer() { @@ -41,8 +41,8 @@ StructuredEventConsumer_i::disconnect_structured_push_consumer() void StructuredEventConsumer_i::offer_change( - const CosNotification::EventTypeSeq &, + const CosNotification::EventTypeSeq &, const CosNotification::EventTypeSeq & ) { -} +} diff --git a/TAO/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp b/TAO/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp index fd3292c21ef..0747d830bbf 100644 --- a/TAO/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp +++ b/TAO/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp @@ -1,7 +1,7 @@ // $Id$ #include "StructuredEventSupplier_i.h" -#include <tao/PortableServer/PS_CurrentC.h> +#include "tao/PortableServer/PS_CurrentC.h" StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb) : orb_(CORBA::ORB::_duplicate(orb)) @@ -13,7 +13,7 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier () { CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); - PortableServer::Current_var current = + PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); @@ -23,8 +23,8 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier () void StructuredEventSupplier_i::subscription_change ( - const CosNotification::EventTypeSeq &, + const CosNotification::EventTypeSeq &, const CosNotification::EventTypeSeq & ) { -} +} diff --git a/TAO/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp b/TAO/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp index 3cdd30f8954..7f4d6bc3524 100644 --- a/TAO/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp +++ b/TAO/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp @@ -1,7 +1,7 @@ // $Id$ #include "StructuredEventConsumer_i.h" -#include <tao/PortableServer/PS_CurrentC.h> +#include "tao/PortableServer/PS_CurrentC.h" #include <iostream> StructuredEventConsumer_i::StructuredEventConsumer_i(CORBA::ORB_ptr orb) @@ -9,22 +9,22 @@ StructuredEventConsumer_i::StructuredEventConsumer_i(CORBA::ORB_ptr orb) { } -void +void StructuredEventConsumer_i::push_structured_event( const CosNotification::StructuredEvent &event) { - const char *value; + const char *value; - for (unsigned int i=0; i<event.filterable_data.length(); i++) { + for (unsigned int i=0; i<event.filterable_data.length(); i++) { event.filterable_data[i].value >>= value; std::cout << event.filterable_data[i].name << "\t" <<value<< std::endl; - } + } - std::cerr << "MessengerConsumer: success" << std::endl; + std::cerr << "MessengerConsumer: success" << std::endl; } -void +void StructuredEventConsumer_i::disconnect_structured_push_consumer() { @@ -34,13 +34,13 @@ StructuredEventConsumer_i::disconnect_structured_push_consumer() PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - + } void StructuredEventConsumer_i::offer_change( - const CosNotification::EventTypeSeq &, + const CosNotification::EventTypeSeq &, const CosNotification::EventTypeSeq &) { //Noop -} +} diff --git a/TAO/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp b/TAO/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp index 08c7cef843d..0bd7c8a5ccb 100644 --- a/TAO/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp +++ b/TAO/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp @@ -1,7 +1,7 @@ // $Id$ #include "StructuredEventSupplier_i.h" -#include <tao/PortableServer/PS_CurrentC.h> +#include "tao/PortableServer/PS_CurrentC.h" StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb) : orb_(CORBA::ORB::_duplicate(orb)) @@ -11,19 +11,19 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb) void StructuredEventSupplier_i::disconnect_structured_push_supplier () { - + CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); - PortableServer::Current_var current = + PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - + } void StructuredEventSupplier_i::subscription_change ( - const CosNotification::EventTypeSeq &, + const CosNotification::EventTypeSeq &, const CosNotification::EventTypeSeq &) { -} +} diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp index 5b9eb201b5d..7c952de272a 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp @@ -1,8 +1,8 @@ // $Id$ #include "ClientInterceptor.h" -#include <tao/OctetSeqC.h> -#include <tao/PI/ClientRequestInfo.h> +#include "tao/OctetSeqC.h" +#include "tao/PI/ClientRequestInfo.h" #include "ace/OS_NS_string.h" #include <iostream> diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h index 70d1e5ed013..2e4654080e2 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h +++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h @@ -3,9 +3,9 @@ #ifndef CLIENTINTERCEPTOR_H #define CLIENTINTERCEPTOR_H -#include <tao/PortableInterceptorC.h> -#include <tao/LocalObject.h> -#include <tao/PI/PI.h> +#include "tao/PortableInterceptorC.h" +#include "tao/LocalObject.h" +#include "tao/PI/PI.h" class ClientInterceptor : public virtual PortableInterceptor::ClientRequestInterceptor, diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerClient.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerClient.cpp index d1a0a778e5e..924cbabb0dc 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerClient.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerClient.cpp @@ -2,9 +2,9 @@ #include "MessengerC.h" #include "ClientInitializer.h" -#include <tao/ORBInitializer_Registry.h> -// Ensure that the PI library is linked in when building statically -#include <tao/PI/PI.h> +#include "tao/ORBInitializer_Registry.h" +// Ensure that the PI library is linked in when building statically +#include "tao/PI/PI.h" #include <orbsvcs/CosNamingC.h> #include <iostream> diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerServer.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerServer.cpp index 760342c0ed9..21fdc9d783f 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerServer.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerServer.cpp @@ -3,19 +3,19 @@ #include "Messenger_i.h" #include "MessengerS.h" #include "ServerInitializer.h" -#include <tao/ORBInitializer_Registry.h> +#include "tao/ORBInitializer_Registry.h" // Ensure that the PI_Server library is linked in when building statically -#include <tao/PI_Server/PI_Server.h> +#include "tao/PI_Server/PI_Server.h" #include <iostream> #include <fstream> int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try + try { ServerInitializer *temp_initializer = 0; - + temp_initializer = new ServerInitializer; PortableInterceptor::ORBInitializer_var orb_initializer = @@ -37,21 +37,21 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // Create an object Messenger_i messenger_servant; - PortableServer::ObjectId_var oid = + PortableServer::ObjectId_var oid = poa->activate_object( &messenger_servant ); CORBA::Object_var messenger_obj = poa->id_to_reference( oid.in() ); - + CORBA::String_var str = orb->object_to_string( messenger_obj.in() ); std::ofstream iorFile ( "Messenger.ior" ); iorFile << str.in() << std::endl; iorFile.close(); - std::cout << std::endl << "IOR written to file Messenger.ior" << std::endl; + std::cout << std::endl << "IOR written to file Messenger.ior" << std::endl; // Accept requests orb->run(); orb->destroy(); } - + catch(const CORBA::Exception& ex) { std::cerr << "Caught CORBA exception: " << ex << std::endl; diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp index 17d20a88038..dead4337e88 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ServerInterceptor.h" -#include <tao/PI_Server/ServerRequestInfoA.h> +#include "tao/PI_Server/ServerRequestInfoA.h" #include "ace/OS_NS_string.h" #if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY == 1) #include <iostream> diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerClient.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerClient.cpp index a313d21cd5b..38711aa1414 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerClient.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerClient.cpp @@ -2,9 +2,9 @@ #include "MessengerC.h" #include "ClientInitializer.h" -#include <tao/ORBInitializer_Registry.h> +#include "tao/ORBInitializer_Registry.h" // Ensure that the PI library is linked in when building statically -#include <tao/PI/PI.h> +#include "tao/PI/PI.h" #include <iostream> int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerServer.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerServer.cpp index d34834e696a..e792d7b5f4c 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerServer.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerServer.cpp @@ -3,9 +3,9 @@ #include "Messenger_i.h" #include "MessengerC.h" #include "ServerInitializer.h" -#include <tao/ORBInitializer_Registry.h> +#include "tao/ORBInitializer_Registry.h" // Ensure that the PI_Server library is linked in when building statically -#include <tao/PI_Server/PI_Server.h> +#include "tao/PI_Server/PI_Server.h" #include <iostream> #include <fstream> diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp index f2fa075c9e9..d1fe8d4f790 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp @@ -1,6 +1,6 @@ // $Id$ -#include <tao/CodecFactory/CodecFactory.h> +#include "tao/CodecFactory/CodecFactory.h" #include "ace/OS_NS_string.h" #include <iostream> #include "Messenger_i.h" diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.cpp index c3258d999b1..ac822d2b392 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.cpp @@ -1,8 +1,8 @@ // $Id$ #include "ServerInterceptor.h" -#include <tao/PI_Server/ServerRequestInfoA.h> -#include <tao/OctetSeqC.h> +#include "tao/PI_Server/ServerRequestInfoA.h" +#include "tao/OctetSeqC.h" #include <iostream> const IOP::ServiceId service_id = 0xdeed; diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerClient.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerClient.cpp index 1d446783663..6b5fd4962fc 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerClient.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerClient.cpp @@ -3,9 +3,9 @@ #include "MessengerC.h" #include "ClientInitializer.h" -#include <tao/ORBInitializer_Registry.h> -// Ensure that the PI library is linked in when building statically -#include <tao/PI/PI.h> +#include "tao/ORBInitializer_Registry.h" +// Ensure that the PI library is linked in when building statically +#include "tao/PI/PI.h" #include <orbsvcs/CosNamingC.h> #include <iostream> @@ -18,7 +18,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; - + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Client ORB"); @@ -43,12 +43,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::String_var message = CORBA::string_dup( "Hello!" ); messenger->send_message( "TAO User", "TAO Test", message.inout() ); } - + catch(const CORBA::Exception& ex) { std::cerr << "client Caught CORBA exception: " << ex << std::endl; return 1; } - + return 0; } diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp index 4abd24fa8c8..fb7e989084d 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp @@ -4,9 +4,9 @@ #include "MessengerS.h" #include "ServerInitializer.h" -#include <tao/ORBInitializer_Registry.h> +#include "tao/ORBInitializer_Registry.h" // Ensure that the PI_Server library is linked in when building statically -#include <tao/PI_Server/PI_Server.h> +#include "tao/PI_Server/PI_Server.h" #include <orbsvcs/CosNamingC.h> #include <iostream> #include <fstream> @@ -18,7 +18,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) try { ServerInitializer *temp_initializer = 0; - + temp_initializer = new ServerInitializer; PortableInterceptor::ORBInitializer_var orb_initializer = @@ -40,7 +40,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // Create an object Messenger_i messenger_servant; - PortableServer::ObjectId_var oid = + PortableServer::ObjectId_var oid = poa->activate_object( &messenger_servant ); CORBA::Object_var messenger_obj = poa->id_to_reference( oid.in() ); @@ -48,7 +48,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) std::ofstream iorFile ( "Messenger.ior" ); iorFile << str.in() << std::endl; iorFile.close(); - std::cout << std::endl << "IOR written to file Messenger.ior" << std::endl; + std::cout << std::endl << "IOR written to file Messenger.ior" << std::endl; // Accept requests orb->run(); @@ -60,6 +60,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) std::cerr << "server Caught CORBA exception: " << ex << std::endl; return 1; } - + return 0; } diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerClient.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerClient.cpp index 27a271d0280..072c872ae7c 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerClient.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerClient.cpp @@ -3,9 +3,9 @@ #include "MessengerC.h" #include "ClientInitializer.h" -#include <tao/ORBInitializer_Registry.h> -// Ensure that the PI library is linked in when building statically -#include <tao/PI/PI.h> +#include "tao/ORBInitializer_Registry.h" +// Ensure that the PI library is linked in when building statically +#include "tao/PI/PI.h" #include <orbsvcs/CosNamingC.h> #include <iostream> @@ -18,7 +18,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; - + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Client ORB"); @@ -28,20 +28,20 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // interceptor initializer. temp_initializer->set_slot_data (); - CORBA::Object_var naming_obj = + CORBA::Object_var naming_obj = orb->resolve_initial_references( "NameService" ); - CosNaming::NamingContext_var root = + CosNaming::NamingContext_var root = CosNaming::NamingContext::_narrow( naming_obj.in() ); if ( CORBA::is_nil(root.in() ) ) { std::cerr << "Couldn't find Naming Service." << std::endl; return 1; } - + // get Messenger CosNaming::Name name; name.length(1); name[0].id = CORBA::string_dup( "Messenger" ); - + CORBA::Object_var obj = root->resolve( name ); Messenger_var messenger = Messenger::_narrow( obj.in() ); @@ -54,7 +54,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) messenger->send_message( "TAO User", "TAO Test", message.inout() ); } - + catch(const CORBA::Exception& ex) { std::cerr << "Caught CORBA exception: " << ex << std::endl; diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerServer.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerServer.cpp index feafcaa323b..32e25584690 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerServer.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerServer.cpp @@ -4,9 +4,9 @@ #include "MessengerS.h" #include "ServerInitializer.h" -#include <tao/ORBInitializer_Registry.h> +#include "tao/ORBInitializer_Registry.h" // Ensure that the PI_Server library is linked in when building statically -#include <tao/PI_Server/PI_Server.h> +#include "tao/PI_Server/PI_Server.h" #include <orbsvcs/CosNamingC.h> #include <iostream> @@ -51,25 +51,25 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CosNaming::Name name; name.length( 1 ); name[0].id = CORBA::string_dup( "Messenger" ); - - PortableServer::ObjectId_var oid = + + PortableServer::ObjectId_var oid = poa->activate_object( &messenger_servant ); CORBA::Object_var messenger_obj = poa->id_to_reference( oid.in() ); - + root->rebind(name, messenger_obj.in()); - + std::cout << "Messenger bound in Naming Service" << std::endl; // Accept requests orb->run(); orb->destroy(); } - + catch(const CORBA::Exception& ex) { std::cerr << "Caught CORBA exception: " << ex << std::endl; return 1; } - + return 0; } diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerClient.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerClient.cpp index 41b9bfb6a02..85af6d0c712 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerClient.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerClient.cpp @@ -2,9 +2,9 @@ #include "MessengerC.h" #include "ClientInitializer.h" -#include <tao/ORBInitializer_Registry.h> +#include "tao/ORBInitializer_Registry.h" // Ensure that the PI library is linked in when building statically -#include <tao/PI/PI.h> +#include "tao/PI/PI.h" #include <iostream> int diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerServer.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerServer.cpp index 8705ab04189..66c731f89e3 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerServer.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerServer.cpp @@ -3,9 +3,9 @@ #include "Messenger_i.h" #include "MessengerC.h" #include "ServerInitializer.h" -#include <tao/ORBInitializer_Registry.h> +#include "tao/ORBInitializer_Registry.h" // Ensure that the PI_Server library is linked in when building statically -#include <tao/PI_Server/PI_Server.h> +#include "tao/PI_Server/PI_Server.h" #include <iostream> #include <fstream> diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp index a7194a2e661..71b1860bcd7 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp @@ -2,7 +2,7 @@ #include "Messenger_i.h" #include "ace/OS_NS_string.h" -#include <tao/CodecFactory/CodecFactory.h> +#include "tao/CodecFactory/CodecFactory.h" #include <iostream> // Implementation skeleton constructor diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp index 481ac8ea68e..af730ae24c5 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp @@ -1,8 +1,8 @@ // $Id$ #include "ServerInterceptor.h" -#include <tao/PI_Server/ServerRequestInfoA.h> -#include <tao/OctetSeqC.h> +#include "tao/PI_Server/ServerRequestInfoA.h" +#include "tao/OctetSeqC.h" #include <iostream> const IOP::ServiceId service_id = 0xdeed; diff --git a/TAO/DevGuideExamples/RTCORBA/MessengerClient.cpp b/TAO/DevGuideExamples/RTCORBA/MessengerClient.cpp index 45d21fee505..873c17036b4 100644 --- a/TAO/DevGuideExamples/RTCORBA/MessengerClient.cpp +++ b/TAO/DevGuideExamples/RTCORBA/MessengerClient.cpp @@ -3,7 +3,7 @@ #include "MessengerC.h" #include "common.h" #include <iostream> -#include <tao/RTCORBA/RTCORBA.h> +#include "tao/RTCORBA/RTCORBA.h" int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/DevGuideExamples/RTCORBA/MessengerServer.cpp b/TAO/DevGuideExamples/RTCORBA/MessengerServer.cpp index 87f7a80f88c..6ee50964e5e 100644 --- a/TAO/DevGuideExamples/RTCORBA/MessengerServer.cpp +++ b/TAO/DevGuideExamples/RTCORBA/MessengerServer.cpp @@ -5,7 +5,7 @@ #include <iostream> #include <fstream> #include <fstream> -#include <tao/RTCORBA/RTCORBA.h> +#include "tao/RTCORBA/RTCORBA.h" int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/DevGuideExamples/RTCORBA/Messenger_i.h b/TAO/DevGuideExamples/RTCORBA/Messenger_i.h index 3f494bb1d5f..7e844371990 100644 --- a/TAO/DevGuideExamples/RTCORBA/Messenger_i.h +++ b/TAO/DevGuideExamples/RTCORBA/Messenger_i.h @@ -16,7 +16,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include <tao/RTCORBA/RTCORBA.h> +#include "tao/RTCORBA/RTCORBA.h" //Class Messenger_i class Messenger_i : public virtual POA_Messenger diff --git a/TAO/DevGuideExamples/RTCORBA/common.h b/TAO/DevGuideExamples/RTCORBA/common.h index dad3942a5f1..4fb308cb437 100644 --- a/TAO/DevGuideExamples/RTCORBA/common.h +++ b/TAO/DevGuideExamples/RTCORBA/common.h @@ -3,7 +3,7 @@ #ifndef MESSENGER_COMMON_H #define MESSENGER_COMMON_H -#include <tao/corba.h> +#include "tao/corba.h" CORBA::ULong get_total_lanes(); CORBA::Short get_increment(); diff --git a/TAO/DevGuideExamples/ValueTypes/Bank/_pch.h b/TAO/DevGuideExamples/ValueTypes/Bank/_pch.h index a86451d29c8..fe6d2628083 100644 --- a/TAO/DevGuideExamples/ValueTypes/Bank/_pch.h +++ b/TAO/DevGuideExamples/ValueTypes/Bank/_pch.h @@ -4,9 +4,9 @@ #define PCH_H #ifdef USING_PCH -#include <tao/corba.h> -#include <tao/ORB_Core.h> -#include <tao/Stub.h> +#include "tao/corba.h" +#include "tao/ORB_Core.h" +#include "tao/Stub.h" #endif #endif diff --git a/TAO/DevGuideExamples/ValueTypes/Bank/server.cpp b/TAO/DevGuideExamples/ValueTypes/Bank/server.cpp index d05a787f5bc..b6f092d0187 100644 --- a/TAO/DevGuideExamples/ValueTypes/Bank/server.cpp +++ b/TAO/DevGuideExamples/ValueTypes/Bank/server.cpp @@ -4,7 +4,7 @@ #include "bankS.h" -#include <tao/AnyTypeCode/TypeCode.h> +#include "tao/AnyTypeCode/TypeCode.h" #include "ace/OS_NS_stdio.h" #include <iostream> #include <fstream> diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.cpp b/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.cpp index a3d110f70d3..1ea1f9370da 100644 --- a/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.cpp +++ b/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.cpp @@ -4,7 +4,7 @@ #include "Message_i.h" #include "MessengerC.h" -#include <tao/AnyTypeCode/TypeCode.h> +#include "tao/AnyTypeCode/TypeCode.h" #include <iostream> @@ -64,7 +64,7 @@ void MessageImpl::text(const char* s) { void MessageImpl::print() { std::cout << "Message from : " << user_() << std::endl; - + AddrList& addrs = addrs_(); if (addrs.length() > 0) { std::cout << "\tTo : "; diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.h b/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.h index 41245b7e26a..f4dac3f034d 100644 --- a/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.h +++ b/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.h @@ -5,7 +5,7 @@ #include "MessengerC.h" -#include <tao/Valuetype/ValueFactory.h> +#include "tao/Valuetype/ValueFactory.h" class MessageImpl : public virtual OBV_Message, public virtual CORBA::DefaultValueRefCountBase @@ -22,13 +22,13 @@ public: virtual ::Message::AddrList* getAddresses(); virtual void addAddress(const char*); - + virtual char* user(); virtual void user(const char*); - + virtual char* subject(); virtual void subject(const char*); - + virtual char* text(); virtual void text(const char*); diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/_pch.h b/TAO/DevGuideExamples/ValueTypes/Messenger/_pch.h index a86451d29c8..fe6d2628083 100644 --- a/TAO/DevGuideExamples/ValueTypes/Messenger/_pch.h +++ b/TAO/DevGuideExamples/ValueTypes/Messenger/_pch.h @@ -4,9 +4,9 @@ #define PCH_H #ifdef USING_PCH -#include <tao/corba.h> -#include <tao/ORB_Core.h> -#include <tao/Stub.h> +#include "tao/corba.h" +#include "tao/ORB_Core.h" +#include "tao/Stub.h" #endif #endif diff --git a/TAO/DevGuideExamples/ValueTypes/Notify/Event_i.h b/TAO/DevGuideExamples/ValueTypes/Notify/Event_i.h index ecf09290bf4..a767bd47a5b 100644 --- a/TAO/DevGuideExamples/ValueTypes/Notify/Event_i.h +++ b/TAO/DevGuideExamples/ValueTypes/Notify/Event_i.h @@ -6,7 +6,7 @@ #include "EventS.h" #include <iostream> -#include <tao/Valuetype/ValueFactory.h> +#include "tao/Valuetype/ValueFactory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once @@ -33,12 +33,12 @@ public: } ACE_DEBUG((LM_DEBUG, "\n")); } - + virtual CORBA::Long size () { return payload().length(); } - + virtual void add_long (CORBA::Long n) { CORBA::LongSeq& pl = payload(); diff --git a/TAO/DevGuideExamples/ValueTypes/Notify/consumer.cpp b/TAO/DevGuideExamples/ValueTypes/Notify/consumer.cpp index a0db2b5ccdb..a325b72b9c5 100644 --- a/TAO/DevGuideExamples/ValueTypes/Notify/consumer.cpp +++ b/TAO/DevGuideExamples/ValueTypes/Notify/consumer.cpp @@ -11,8 +11,8 @@ const char* notify_ior = "corbaloc::localhost:8888/NotifyEventChannelFactory"; #include <orbsvcs/CosNotifyChannelAdminC.h> -#include <tao/corba.h> -#include <tao/ORB_Core.h> +#include "tao/corba.h" +#include "tao/ORB_Core.h" #include <iostream> #include <stdexcept> diff --git a/TAO/DevGuideExamples/ValueTypes/Notify/supplier.cpp b/TAO/DevGuideExamples/ValueTypes/Notify/supplier.cpp index 022c0defbfb..eb7af2dc911 100644 --- a/TAO/DevGuideExamples/ValueTypes/Notify/supplier.cpp +++ b/TAO/DevGuideExamples/ValueTypes/Notify/supplier.cpp @@ -11,8 +11,8 @@ const char* notify_ior = "corbaloc::localhost:8888/NotifyEventChannelFactory"; #include <orbsvcs/CosNotifyChannelAdminC.h> -#include <tao/corba.h> -#include <tao/ORB_Core.h> +#include "tao/corba.h" +#include "tao/ORB_Core.h" #include "ace/Reactor.h" #include "ace/Event_Handler.h" |