diff options
51 files changed, 196 insertions, 139 deletions
diff --git a/TAO/DevGuideExamples/AMH_AMI/inner_i.cpp b/TAO/DevGuideExamples/AMH_AMI/inner_i.cpp index 71a7020a330..c1c696ecbc2 100644 --- a/TAO/DevGuideExamples/AMH_AMI/inner_i.cpp +++ b/TAO/DevGuideExamples/AMH_AMI/inner_i.cpp @@ -9,7 +9,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html #include "inner_i.h" -#include <ace/OS.h> +#include "ace/OS.h" Inner_i::Inner_i (int d) : divisor_ (d) diff --git a/TAO/DevGuideExamples/AMH_AMI/middle_server.cpp b/TAO/DevGuideExamples/AMH_AMI/middle_server.cpp index 89e6150cb88..a4afca3e4ed 100644 --- a/TAO/DevGuideExamples/AMH_AMI/middle_server.cpp +++ b/TAO/DevGuideExamples/AMH_AMI/middle_server.cpp @@ -3,7 +3,7 @@ #include "amh_ami_pch.h" #include "middle_i.h" -#include <ace/OS_String.h> +#include "ace/OS_String.h" #include <iostream> #include <fstream> diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp index 8faaa4c8302..08bad647881 100644 --- a/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp +++ b/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp @@ -5,8 +5,8 @@ #include "callback_i.h" #include "simpleC.h" -#include <ace/Get_Opt.h> -#include <ace/Argv_Type_Converter.h> +#include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include <tao/BiDir_GIOP/BiDirGIOP.h> #include <iostream> diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp index a067aaf4341..15730840494 100644 --- a/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp +++ b/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp @@ -5,8 +5,8 @@ #include "simple_i.h" #include "callbackC.h" -#include <ace/Get_Opt.h> -#include <ace/Argv_Type_Converter.h> +#include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include <tao/BiDir_GIOP/BiDirGIOP.h> #include <iostream> #include <fstream> diff --git a/TAO/DevGuideExamples/ChangeLog b/TAO/DevGuideExamples/ChangeLog index e5321de638e..5f09132ee87 100644 --- a/TAO/DevGuideExamples/ChangeLog +++ b/TAO/DevGuideExamples/ChangeLog @@ -1,3 +1,60 @@ +Wed Oct 22 15:42:56 UTC 2008 Abdullah Sowayan <abdullah.sowayan@lmco.com> + + * AMH_AMI/inner_i.cpp: + * AMH_AMI/middle_server.cpp: + * BiDirectionalGIOP/client.cpp: + * BiDirectionalGIOP/server.cpp: + * EventServices/OMG_TypedEC/ConsumerMain.cpp: + * EventServices/RTEC_Basic/EchoEventConsumer_i.cpp: + * EventServices/RTEC_Federated/EchoEventConsumer_i.cpp: + * EventServices/RTEC_Federated/EchoEventSupplierMain.cpp: + * EventServices/RTEC_Filter/EchoEventConsumer_i.cpp: + * EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.cpp: + * EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp: + * EventServices/RTEC_MCast_Federated/SimpleAddressServer.cpp: + * ImplRepo/IORTable/MessengerClient.cpp: + * InterfaceRepo/IFRBrowser.cpp: + * LocalObjects/ServantLocator/MessengerLocator_i.cpp: + * Messaging/AMIcallback/MessengerClient.cpp: + * Messaging/AMIcallback/MessengerHandler.cpp: + * Messaging/AMIcallback/Messenger_i.cpp: + * Messaging/RelativeRoundtripTimeout/Messenger_i.cpp: + * Multithreading/GracefulShutdown/MessengerClient.cpp: + * Multithreading/GracefulShutdown/MessengerServer.h: + * Multithreading/GracefulShutdown/MessengerServer.cpp: + * Multithreading/GracefulShutdown/MessengerShutdownTimer.h: + * Multithreading/ThreadPerConnection/Messenger_i.cpp: + * Multithreading/ThreadPool/MessengerServer.cpp: + * Multithreading/ThreadPool/Messenger_i.cpp: + * NamingService/Naming_Server/MessengerTask.h: + * NamingService/Naming_Server/NamingMessenger.cpp: + * NamingService/Naming_Server/NamingTask.h: + * NamingService/Naming_Server/NamingTask.cpp: + * NotifyService/EventSequence/Messenger_i.h: + * NotifyService/Filtering/MessengerConsumer.cpp: + * NotifyService/Filtering/MessengerServer.cpp: + * NotifyService/Messenger/Messenger_i.cpp: + * NotifyService/RTNotify/Messenger_i.cpp: + * NotifyService/SupplierSideNC/MessengerConsumer.cpp: + * NotifyService/SupplierSideNC/MessengerSupplier.cpp: + * PortableInterceptors/Auth/ClientInterceptor.cpp: + * PortableInterceptors/Auth/ServerInterceptor.cpp: + * PortableInterceptors/IOR/Messenger_i.cpp: + * PortableInterceptors/PICurrent/Messenger_i.cpp: + * PortableInterceptors/PICurrent_NameService/Messenger_i.cpp: + * PortableInterceptors/SimpleCodec/Messenger_i.cpp: + * RTCORBA/Messenger_i.cpp: + * Security/ParticipatingApp/Messenger_i.cpp: + * Security/PolicyControllingApp/MessengerClient.cpp: + * SmartProxies/Logger_i.h: + * SmartProxies/Logger_i.cpp: + * ValueTypes/Bank/server.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:25:00 UTC 2008 Simon Massey <sma at prismtech dot com> * NotifyService/Messenger/Messenger.mpc: diff --git a/TAO/DevGuideExamples/EventServices/OMG_TypedEC/ConsumerMain.cpp b/TAO/DevGuideExamples/EventServices/OMG_TypedEC/ConsumerMain.cpp index c14414fa27a..432a93d7299 100644 --- a/TAO/DevGuideExamples/EventServices/OMG_TypedEC/ConsumerMain.cpp +++ b/TAO/DevGuideExamples/EventServices/OMG_TypedEC/ConsumerMain.cpp @@ -11,7 +11,7 @@ #include <orbsvcs/CosTypedEventChannelAdminC.h> #include <orbsvcs/CosNamingC.h> #include <tao/AnyTypeCode/TypeCode.h> -#include <ace/OS_NS_stdio.h> +#include "ace/OS_NS_stdio.h" #include <iostream> const int EVENTS_TILL_SHUTDOWN = 10; diff --git a/TAO/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.cpp b/TAO/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.cpp index cdc851d54fe..ca3740232be 100644 --- a/TAO/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.cpp +++ b/TAO/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.cpp @@ -5,7 +5,7 @@ #include "EchoEventConsumer_i.h" #include <tao/PortableServer/PS_CurrentC.h> -#include <ace/OS_NS_stdio.h> +#include "ace/OS_NS_stdio.h" #include <sstream> // Constructor duplicates the ORB reference. @@ -36,7 +36,7 @@ void EchoEventConsumer_i::push(const RtecEventComm::EventSet& events) out << " text: " << eventData; } - ACE_OS::printf("%s\n", out.str().c_str()); // printf is synchronized + ACE_OS::printf("%s\n", out.str().c_str()); // printf is synchronized } if (--event_limit_ <= 0) { supplier_->disconnect_push_supplier(); diff --git a/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.cpp b/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.cpp index cdc851d54fe..ca3740232be 100644 --- a/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.cpp +++ b/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.cpp @@ -5,7 +5,7 @@ #include "EchoEventConsumer_i.h" #include <tao/PortableServer/PS_CurrentC.h> -#include <ace/OS_NS_stdio.h> +#include "ace/OS_NS_stdio.h" #include <sstream> // Constructor duplicates the ORB reference. @@ -36,7 +36,7 @@ void EchoEventConsumer_i::push(const RtecEventComm::EventSet& events) out << " text: " << eventData; } - ACE_OS::printf("%s\n", out.str().c_str()); // printf is synchronized + ACE_OS::printf("%s\n", out.str().c_str()); // printf is synchronized } if (--event_limit_ <= 0) { supplier_->disconnect_push_supplier(); diff --git a/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp b/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp index 94060e4dbff..48c44b827a7 100644 --- a/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp +++ b/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp @@ -14,7 +14,7 @@ #include <orbsvcs/Event/EC_Gateway_IIOP.h> #include <orbsvcs/Event/EC_Default_Factory.h> -#include <ace/Thread_Manager.h> +#include "ace/Thread_Manager.h" #include <iostream> #include <fstream> diff --git a/TAO/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.cpp b/TAO/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.cpp index cdc851d54fe..ca3740232be 100644 --- a/TAO/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.cpp +++ b/TAO/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.cpp @@ -5,7 +5,7 @@ #include "EchoEventConsumer_i.h" #include <tao/PortableServer/PS_CurrentC.h> -#include <ace/OS_NS_stdio.h> +#include "ace/OS_NS_stdio.h" #include <sstream> // Constructor duplicates the ORB reference. @@ -36,7 +36,7 @@ void EchoEventConsumer_i::push(const RtecEventComm::EventSet& events) out << " text: " << eventData; } - ACE_OS::printf("%s\n", out.str().c_str()); // printf is synchronized + ACE_OS::printf("%s\n", out.str().c_str()); // printf is synchronized } if (--event_limit_ <= 0) { supplier_->disconnect_push_supplier(); diff --git a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.cpp b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.cpp index cdc851d54fe..ca3740232be 100644 --- a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.cpp +++ b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.cpp @@ -5,7 +5,7 @@ #include "EchoEventConsumer_i.h" #include <tao/PortableServer/PS_CurrentC.h> -#include <ace/OS_NS_stdio.h> +#include "ace/OS_NS_stdio.h" #include <sstream> // Constructor duplicates the ORB reference. @@ -36,7 +36,7 @@ void EchoEventConsumer_i::push(const RtecEventComm::EventSet& events) out << " text: " << eventData; } - ACE_OS::printf("%s\n", out.str().c_str()); // printf is synchronized + ACE_OS::printf("%s\n", out.str().c_str()); // printf is synchronized } if (--event_limit_ <= 0) { supplier_->disconnect_push_supplier(); diff --git a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp index 8a0b4b09c8e..85ab0092dfc 100644 --- a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp +++ b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp @@ -21,7 +21,7 @@ #include <tao/ORB_Core.h> -#include <ace/Auto_Ptr.h> +#include "ace/Auto_Ptr.h" #include <iostream> #include <fstream> diff --git a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.cpp b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.cpp index 0ffeda9ba79..44433fb5a00 100644 --- a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.cpp +++ b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.cpp @@ -3,8 +3,8 @@ // SimpleAddressServer.cpp #include "SimpleAddressServer.h" -#include <ace/INET_Addr.h> -#include <ace/OS_NS_string.h> +#include "ace/INET_Addr.h" +#include "ace/OS_NS_string.h" SimpleAddressServer::SimpleAddressServer (const ACE_INET_Addr& address) { #if defined (ACE_HAS_IPV6) diff --git a/TAO/DevGuideExamples/ImplRepo/IORTable/MessengerClient.cpp b/TAO/DevGuideExamples/ImplRepo/IORTable/MessengerClient.cpp index 0c088895dcb..5098d2cd525 100644 --- a/TAO/DevGuideExamples/ImplRepo/IORTable/MessengerClient.cpp +++ b/TAO/DevGuideExamples/ImplRepo/IORTable/MessengerClient.cpp @@ -1,7 +1,7 @@ // $Id$ #include "MessengerC.h" -#include <ace/SString.h> +#include "ace/SString.h" #include <iostream> diff --git a/TAO/DevGuideExamples/InterfaceRepo/IFRBrowser.cpp b/TAO/DevGuideExamples/InterfaceRepo/IFRBrowser.cpp index b8aaa809e34..d135f880298 100644 --- a/TAO/DevGuideExamples/InterfaceRepo/IFRBrowser.cpp +++ b/TAO/DevGuideExamples/InterfaceRepo/IFRBrowser.cpp @@ -1,4 +1,4 @@ -// $Id$ +// $Id$ // // IFRBrowser.cpp @@ -9,7 +9,7 @@ #include <tao/IFR_Client/IFR_BasicC.h> #include <tao/ORB.h> -#include <ace/Log_Msg.h> +#include "ace/Log_Msg.h" #include <iostream> diff --git a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp index e248db3f5ea..85f96331c04 100644 --- a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp +++ b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp @@ -3,7 +3,7 @@ #include "MessengerLocator_i.h" #include "Messenger_i.h" -#include <ace/SString.h> +#include "ace/SString.h" #include <iostream> Messenger_Locator_i::Messenger_Locator_i() diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp index 4b0b013ec89..e9afc3a5e6c 100644 --- a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp +++ b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp @@ -3,9 +3,9 @@ #include "MessengerC.h" #include "MessengerHandler.h" -#include <ace/OS_NS_stdio.h> -#include <ace/OS_NS_unistd.h> -#include <ace/OS_NS_sys_time.h> +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_sys_time.h" #include <iostream> //----------------------------------------------------------------------------- diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp index ad31f84aeab..05b7704ef2f 100644 --- a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp +++ b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp @@ -1,7 +1,7 @@ // $Id$ #include "MessengerHandler.h" -#include <ace/OS_NS_time.h> +#include "ace/OS_NS_time.h" #include <iostream> // Implementation skeleton constructor @@ -20,7 +20,7 @@ void MessengerHandler::send_message ( CORBA::Boolean ami_return_val, const char * message, CORBA::Long time - ) + ) { if (ami_return_val) { diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp index 820971c777c..b4e205cde4d 100644 --- a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp +++ b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp @@ -8,8 +8,8 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html #include "Messenger_i.h" -#include <ace/OS_NS_unistd.h> -#include <ace/OS_NS_sys_time.h> +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_sys_time.h" #include <iostream> // Implementation skeleton constructor Messenger_i::Messenger_i (unsigned int seconds_to_wait, @@ -36,22 +36,22 @@ CORBA::Boolean Messenger_i::send_message ( std::cout << "Throwing MessengerUnableToSendMessage exception." << std::endl; throw MessengerUnableToSendMessage(); } - + std::cout << "Write a letter to " << user_name << " as follows:" << std::endl; std::cout << "Subject: " << subject << std::endl; std::cout << "Dear " << user_name << ',' << std::endl; std::cout << message << std::endl; - + if (seconds_to_wait_ > 0) { std::cout << "Waiting for " << seconds_to_wait_ << " seconds..." << std::flush; ACE_OS::sleep(seconds_to_wait_); std::cout << " Done waiting" << std::endl; } - - // Record the time the message was sent + + // Record the time the message was sent time_sent = static_cast<CORBA::Long> (ACE_OS::gettimeofday().sec()); - + // We will assume the message has been sent, so return true return 1; } diff --git a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.cpp b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.cpp index 72d8c63d04a..c3a4a30c219 100644 --- a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.cpp +++ b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.cpp @@ -8,7 +8,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html #include "Messenger_i.h" -#include <ace/OS_NS_unistd.h> +#include "ace/OS_NS_unistd.h" #include <iostream> // Implementation skeleton constructor diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp index 5b2b958e184..f652a5769ff 100644 --- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp +++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp @@ -1,8 +1,8 @@ // $Id$ #include "MessengerC.h" -#include <ace/Get_Opt.h> -#include <ace/Argv_Type_Converter.h> +#include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include <iostream> int call_shutdown = 0; diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp index 12821dc3b48..0225f1d68f2 100644 --- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp +++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp @@ -3,9 +3,9 @@ #include "MessengerServer.h" #include "Messenger_i.h" #include "MessengerShutdownTimer.h" -#include <ace/Get_Opt.h> -#include <ace/Argv_Type_Converter.h> -#include <ace/Reactor.h> +#include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" +#include "ace/Reactor.h" #include <tao/ORB_Core.h> #include <iostream> #include <fstream> diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.h b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.h index 5621cf17e1f..0589a19bcab 100644 --- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.h +++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.h @@ -4,17 +4,17 @@ #define MESSENGERSERVER_H_ #include "MessengerS.h" -#include <ace/Task.h> +#include "ace/Task.h" #include <iostream> //Class MessengerServer class MessengerServer { public: - //Constructor + //Constructor MessengerServer (CORBA::ORB_ptr orb); - - //Destructor + + //Destructor virtual ~MessengerServer (void); // parse arguments diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerShutdownTimer.h b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerShutdownTimer.h index 07b8290ff41..dd40859893a 100644 --- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerShutdownTimer.h +++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerShutdownTimer.h @@ -3,15 +3,15 @@ #ifndef MESSENGERSHUTDOWNTIMER_H_ #define MESSENGERSHUTDOWNTIMER_H_ -#include <ace/Event_Handler.h> +#include "ace/Event_Handler.h" #include <tao/corba.h> class MessengerShutdownTimer : public ACE_Event_Handler { public: - // Constructor + // Constructor MessengerShutdownTimer (CORBA::ORB_ptr orb); - + virtual int handle_timeout ( const ACE_Time_Value & current_time, const void * act); diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp index 38741b7016f..137230f1c26 100644 --- a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp +++ b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp @@ -8,7 +8,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html #include "Messenger_i.h" -#include <ace/Thread.h> +#include "ace/Thread.h" #include <iostream> #include <sstream> @@ -17,12 +17,12 @@ Messenger_i::Messenger_i (void) { } - + // Implementation skeleton destructor Messenger_i::~Messenger_i (void) { } - + CORBA::Boolean Messenger_i::send_message ( const char* /*user_name*/, const char* /*subject*/, @@ -36,4 +36,4 @@ CORBA::Boolean Messenger_i::send_message ( message = CORBA::string_dup(ostr.str().c_str()); return 1; } - + diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPool/MessengerServer.cpp b/TAO/DevGuideExamples/Multithreading/ThreadPool/MessengerServer.cpp index df7cb2f8e19..6035cd3cbcb 100644 --- a/TAO/DevGuideExamples/Multithreading/ThreadPool/MessengerServer.cpp +++ b/TAO/DevGuideExamples/Multithreading/ThreadPool/MessengerServer.cpp @@ -4,7 +4,7 @@ #include <iostream> #include <fstream> // 1. Define a "task" class for implenting the thread pool threads. -#include <ace/Task.h> +#include "ace/Task.h" class ORB_Task : public ACE_Task_Base { diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp index 38741b7016f..137230f1c26 100644 --- a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp +++ b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp @@ -8,7 +8,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html #include "Messenger_i.h" -#include <ace/Thread.h> +#include "ace/Thread.h" #include <iostream> #include <sstream> @@ -17,12 +17,12 @@ Messenger_i::Messenger_i (void) { } - + // Implementation skeleton destructor Messenger_i::~Messenger_i (void) { } - + CORBA::Boolean Messenger_i::send_message ( const char* /*user_name*/, const char* /*subject*/, @@ -36,4 +36,4 @@ CORBA::Boolean Messenger_i::send_message ( message = CORBA::string_dup(ostr.str().c_str()); return 1; } - + diff --git a/TAO/DevGuideExamples/NamingService/Naming_Server/MessengerTask.h b/TAO/DevGuideExamples/NamingService/Naming_Server/MessengerTask.h index bec379d7038..92c9c45de49 100644 --- a/TAO/DevGuideExamples/NamingService/Naming_Server/MessengerTask.h +++ b/TAO/DevGuideExamples/NamingService/Naming_Server/MessengerTask.h @@ -4,7 +4,7 @@ #define MESSENGERTASK_H #include <tao/corba.h> -#include <ace/Task.h> +#include "ace/Task.h" class MessengerTask : public ACE_Task_Base { diff --git a/TAO/DevGuideExamples/NamingService/Naming_Server/NamingMessenger.cpp b/TAO/DevGuideExamples/NamingService/Naming_Server/NamingMessenger.cpp index c4ad255c956..35c41b37b58 100644 --- a/TAO/DevGuideExamples/NamingService/Naming_Server/NamingMessenger.cpp +++ b/TAO/DevGuideExamples/NamingService/Naming_Server/NamingMessenger.cpp @@ -2,7 +2,7 @@ #include "NamingTask.h" #include "MessengerTask.h" -#include <ace/OS.h> +#include "ace/OS.h" int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { @@ -16,7 +16,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) MessengerTask messenger; messenger.activate(); - // Wait the Messenger task finish. + // Wait the Messenger task finish. messenger.wait(); // Shutdown the Naming Service. namingService.end(); diff --git a/TAO/DevGuideExamples/NamingService/Naming_Server/NamingTask.cpp b/TAO/DevGuideExamples/NamingService/Naming_Server/NamingTask.cpp index 7f4cac31a78..58b521f41d3 100644 --- a/TAO/DevGuideExamples/NamingService/Naming_Server/NamingTask.cpp +++ b/TAO/DevGuideExamples/NamingService/Naming_Server/NamingTask.cpp @@ -2,7 +2,7 @@ #include "NamingTask.h" #include <orbsvcs/Naming/Naming_Server.h> -#include <ace/OS_NS_unistd.h> +#include "ace/OS_NS_unistd.h" #include <iostream> NamingTask::NamingTask (int argc, char** argv) diff --git a/TAO/DevGuideExamples/NamingService/Naming_Server/NamingTask.h b/TAO/DevGuideExamples/NamingService/Naming_Server/NamingTask.h index c7fbfe723fa..ce3449b7fc6 100644 --- a/TAO/DevGuideExamples/NamingService/Naming_Server/NamingTask.h +++ b/TAO/DevGuideExamples/NamingService/Naming_Server/NamingTask.h @@ -4,7 +4,7 @@ #define NAMINGTASK_H #include <tao/corba.h> -#include <ace/Task.h> +#include "ace/Task.h" class NamingTask : public ACE_Task<ACE_MT_SYNCH> { diff --git a/TAO/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h b/TAO/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h index 34e085ffd2a..a3c2cbeeff4 100644 --- a/TAO/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h +++ b/TAO/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h @@ -6,7 +6,7 @@ #include "MessengerS.h" #include <orbsvcs/CosNotifyChannelAdminC.h> -#include <ace/Auto_Ptr.h> +#include "ace/Auto_Ptr.h" class EventSequenceSupplier_i; @@ -14,13 +14,13 @@ class Messenger_i : public POA_Messenger { public: Messenger_i (CORBA::ORB_ptr orb); - + virtual ~Messenger_i (void); CORBA::Boolean send_message ( const char * user_name, const char * subject, - char *& message + char *& message ); private: @@ -29,7 +29,7 @@ class Messenger_i : public POA_Messenger auto_ptr<EventSequenceSupplier_i> supplier_; }; -#endif +#endif diff --git a/TAO/DevGuideExamples/NotifyService/Filtering/MessengerConsumer.cpp b/TAO/DevGuideExamples/NotifyService/Filtering/MessengerConsumer.cpp index ed7864ab9b7..035b72b23c0 100644 --- a/TAO/DevGuideExamples/NotifyService/Filtering/MessengerConsumer.cpp +++ b/TAO/DevGuideExamples/NotifyService/Filtering/MessengerConsumer.cpp @@ -1,6 +1,6 @@ // $Id$ -#include <ace/Get_Opt.h> +#include "ace/Get_Opt.h" #include "orbsvcs/CosNotifyChannelAdminC.h" #include "orbsvcs/CosNotifyCommC.h" diff --git a/TAO/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp b/TAO/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp index 5953b384fc4..2c3d0d21ebe 100644 --- a/TAO/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp +++ b/TAO/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp @@ -2,8 +2,8 @@ #include <orbsvcs/CosNamingC.h> #include "Messenger_i.h" -#include <ace/Argv_Type_Converter.h> -#include <ace/Get_Opt.h> +#include "ace/Argv_Type_Converter.h" +#include "ace/Get_Opt.h" #include <iostream> #include <fstream> diff --git a/TAO/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp b/TAO/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp index 1faed52af5c..8e1ef9f2f1a 100644 --- a/TAO/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp +++ b/TAO/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp @@ -3,7 +3,7 @@ #include <orbsvcs/CosNotifyChannelAdminC.h> #include <orbsvcs/CosNotifyCommC.h> #include <orbsvcs/CosNamingC.h> -#include <ace/OS_NS_stdio.h> +#include "ace/OS_NS_stdio.h" #include "Messenger_i.h" #include "StructuredEventSupplier_i.h" @@ -13,51 +13,51 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { - CORBA::Object_var naming_obj = + CORBA::Object_var naming_obj = orb_->resolve_initial_references ("NameService"); - + CosNaming::NamingContext_var naming_context = CosNaming::NamingContext::_narrow (naming_obj.in()); CosNaming::Name name; name.length (1); name[0].id = CORBA::string_dup ("NotifyEventChannelFactory"); - + CORBA::Object_var obj = naming_context->resolve (name); CosNotifyChannelAdmin::EventChannelFactory_var notify_factory = CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ()); - + CosNotifyChannelAdmin::ChannelID id; CosNotification::QoSProperties initial_qos; CosNotification::AdminProperties initial_admin; - + CosNotifyChannelAdmin::EventChannel_var ec = notify_factory->create_channel (initial_qos, initial_admin, id); name[0].id = CORBA::string_dup ("MyEventChannel"); - + naming_context->rebind (name, ec.in()); - - CosNotifyChannelAdmin::AdminID adminid; - CosNotifyChannelAdmin::InterFilterGroupOperator ifgop = - CosNotifyChannelAdmin::OR_OP; - + + CosNotifyChannelAdmin::AdminID adminid; + CosNotifyChannelAdmin::InterFilterGroupOperator ifgop = + CosNotifyChannelAdmin::OR_OP; + CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin = ec->new_for_suppliers (ifgop, adminid); - + CosNotifyChannelAdmin::ProxyID supplieradmin_proxy_id; - + CosNotifyChannelAdmin::ProxyConsumer_var proxy_consumer = supplier_admin->obtain_notification_push_consumer( CosNotifyChannelAdmin::STRUCTURED_EVENT, supplieradmin_proxy_id); - - StructuredEventSupplier_i *servant = + + StructuredEventSupplier_i *servant = new StructuredEventSupplier_i(orb_.in()); - + CORBA::Object_var poa_obj = orb_->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa = PortableServer::POA::_narrow (poa_obj.in ()); PortableServer::POAManager_var mgr = poa->the_POAManager (); @@ -67,12 +67,12 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) CORBA::Object_var supplier_obj = poa->id_to_reference (objectId.in ()); - CosNotifyComm::StructuredPushSupplier_var supplier = + CosNotifyComm::StructuredPushSupplier_var supplier = CosNotifyComm::StructuredPushSupplier::_narrow (supplier_obj.in ()); - - consumer_proxy_ = + + consumer_proxy_ = CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxy_consumer.in()); - + consumer_proxy_-> connect_structured_push_supplier (supplier.in()); } @@ -91,23 +91,23 @@ CORBA::Boolean Messenger_i::send_message ( //cout << "Message from: " << user_name << endl; //cout << "Subject: " << subject << endl; //cout << "Message: " << message << endl; - - + + // Event Definition - CosNotification::StructuredEvent event; - - event.header.fixed_header.event_type.domain_name = + CosNotification::StructuredEvent event; + + event.header.fixed_header.event_type.domain_name = CORBA::string_dup("OCI_TAO"); // string - event.header.fixed_header.event_type.type_name = + event.header.fixed_header.event_type.type_name = CORBA::string_dup("examples"); // string - event.header.fixed_header.event_name = + event.header.fixed_header.event_name = CORBA::string_dup("myevent"); - + // OptionalHeaderFields - // PropertySeq - + // PropertySeq + // sequence<Property>: string name, any value event.filterable_data.length (3); event.filterable_data[0].name = CORBA::string_dup("Message from:"); @@ -116,7 +116,7 @@ CORBA::Boolean Messenger_i::send_message ( event.filterable_data[1].value <<= (const char *)subject; event.filterable_data[2].name = CORBA::string_dup("Message:"); event.filterable_data[2].value <<= (const char *)message; - + std::cout << "pushing " << std::endl; consumer_proxy_->push_structured_event(event); diff --git a/TAO/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp b/TAO/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp index 5ce7f42ef0e..a43202fad6f 100644 --- a/TAO/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp +++ b/TAO/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp @@ -4,7 +4,7 @@ #include <orbsvcs/CosNotifyCommC.h> #include <orbsvcs/CosNamingC.h> #include "orbsvcs/NotifyExtC.h" -#include <ace/OS_NS_stdio.h> +#include "ace/OS_NS_stdio.h" #include "Messenger_i.h" #include "StructuredEventSupplier_i.h" diff --git a/TAO/DevGuideExamples/NotifyService/SupplierSideNC/MessengerConsumer.cpp b/TAO/DevGuideExamples/NotifyService/SupplierSideNC/MessengerConsumer.cpp index a9b7e8a508c..6d286da5e63 100644 --- a/TAO/DevGuideExamples/NotifyService/SupplierSideNC/MessengerConsumer.cpp +++ b/TAO/DevGuideExamples/NotifyService/SupplierSideNC/MessengerConsumer.cpp @@ -1,6 +1,6 @@ // $Id$ -#include <ace/Get_Opt.h> +#include "ace/Get_Opt.h" #include "orbsvcs/CosNotifyChannelAdminC.h" #include "orbsvcs/CosNotifyCommC.h" diff --git a/TAO/DevGuideExamples/NotifyService/SupplierSideNC/MessengerSupplier.cpp b/TAO/DevGuideExamples/NotifyService/SupplierSideNC/MessengerSupplier.cpp index d3ec7ed9f6a..5fc3ef6524c 100644 --- a/TAO/DevGuideExamples/NotifyService/SupplierSideNC/MessengerSupplier.cpp +++ b/TAO/DevGuideExamples/NotifyService/SupplierSideNC/MessengerSupplier.cpp @@ -1,8 +1,8 @@ -// $Id$ +// $Id$ #include <orbsvcs/Notify/Notify_EventChannelFactory_i.h> #include <orbsvcs/CosNamingC.h> -#include <ace/Profile_Timer.h> +#include "ace/Profile_Timer.h" #include "StructuredEventSupplier_i.h" #include <iostream> diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp index 73a30d91681..5b9eb201b5d 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp @@ -3,7 +3,7 @@ #include "ClientInterceptor.h" #include <tao/OctetSeqC.h> #include <tao/PI/ClientRequestInfo.h> -#include <ace/OS_NS_string.h> +#include "ace/OS_NS_string.h" #include <iostream> const CORBA::ULong service_ctx_id = 0xdeed; diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp index 48045fa7b5e..17d20a88038 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp @@ -2,7 +2,7 @@ #include "ServerInterceptor.h" #include <tao/PI_Server/ServerRequestInfoA.h> -#include <ace/OS_NS_string.h> +#include "ace/OS_NS_string.h" #if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY == 1) #include <iostream> #else diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp index bf00c1e5471..f2fa075c9e9 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp @@ -1,7 +1,7 @@ // $Id$ #include <tao/CodecFactory/CodecFactory.h> -#include <ace/OS_NS_string.h> +#include "ace/OS_NS_string.h" #include <iostream> #include "Messenger_i.h" diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.cpp index 866a54c890f..ba67cdb8ef6 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.cpp @@ -8,7 +8,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html #include "Messenger_i.h" -#include <ace/OS_NS_time.h> +#include "ace/OS_NS_time.h" #if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY == 1) #include <iostream> #else diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp index 8057ba8baca..f82e4a0decb 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp @@ -8,7 +8,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html #include "Messenger_i.h" -#include <ace/OS_NS_time.h> +#include "ace/OS_NS_time.h" #if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY == 1) #include <iostream> #else diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp index 32c813b1771..a7194a2e661 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp @@ -1,7 +1,7 @@ // $Id$ #include "Messenger_i.h" -#include <ace/OS_NS_string.h> +#include "ace/OS_NS_string.h" #include <tao/CodecFactory/CodecFactory.h> #include <iostream> diff --git a/TAO/DevGuideExamples/RTCORBA/Messenger_i.cpp b/TAO/DevGuideExamples/RTCORBA/Messenger_i.cpp index 9ead0131eb1..d3a1079ec09 100644 --- a/TAO/DevGuideExamples/RTCORBA/Messenger_i.cpp +++ b/TAO/DevGuideExamples/RTCORBA/Messenger_i.cpp @@ -1,7 +1,7 @@ // $Id$ #include "Messenger_i.h" -#include <ace/Thread.h> +#include "ace/Thread.h" #include <iostream> // Implementation skeleton constructor diff --git a/TAO/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp b/TAO/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp index 3480fadc7ae..6b414ea4a80 100644 --- a/TAO/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp +++ b/TAO/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp @@ -1,7 +1,7 @@ /* -*- C++ -*- $Id$ */ #include "Messenger_i.h" -#include <ace/OS_NS_string.h> +#include "ace/OS_NS_string.h" #include <iostream> Messenger_i::Messenger_i ( @@ -12,11 +12,11 @@ Messenger_i::Messenger_i ( ssliop_current_(SSLIOP::Current::_duplicate(ssliop_current)) { } - + Messenger_i::~Messenger_i (void) { } - + CORBA::Boolean Messenger_i::send_message ( const char * user_name, const char * subject, @@ -33,7 +33,7 @@ CORBA::Boolean Messenger_i::send_message ( std::cout << std::endl; return 1; } - + void Messenger_i::shutdown ( const char * user_name @@ -53,7 +53,7 @@ void Messenger_i::shutdown ( #if 0 char name_buf[BUFSIZ]; - // + // // Populate an attribute type list // to request the initiating principal's // AccessId. @@ -62,7 +62,7 @@ void Messenger_i::shutdown ( requested_attributes.length(0); Security::AttributeType desired_attribute; desired_attribute.attribute_family.family_definer = 0; // OMG - desired_attribute.attribute_family.family = 1; // Privilege + desired_attribute.attribute_family.family = 1; // Privilege // Attributes desired_attribute.attribute_type = Security::AccessId; requested_attributes.length(1); @@ -70,9 +70,9 @@ void Messenger_i::shutdown ( // // Request the attribtue // - Security::AttributeList_var attrib_list = + Security::AttributeList_var attrib_list = this->current_->get_attributes(requested_attributes); - + if(attrib_list->length() > 0) { // @@ -82,15 +82,15 @@ void Messenger_i::shutdown ( attribute_returned.defining_authority = (attrib_list.in())[0].defining_authority ; - attribute_returned.value = + attribute_returned.value = (attrib_list.in())[0].value; - // Certificates are returned in + // Certificates are returned in // X.509 format // const char x509[] = "x509"; // - // Setup a Security::OID (sequence<octet>) + // Setup a Security::OID (sequence<octet>) // to hold the attribute's defining authority. // Security::OID x509_defining_authority; @@ -98,30 +98,30 @@ void Messenger_i::shutdown ( // // Populate the defining authority value. // - CORBA::Octet *buf = + CORBA::Octet *buf = x509_defining_authority.get_buffer(); ACE_OS_String::memcpy( buf, x509, sizeof(x509)); // // Confirm the defining authority is "x509". // - if(attribute_returned.defining_authority == + if(attribute_returned.defining_authority == x509_defining_authority) { // - // Get the buffer holding the certificate + // Get the buffer holding the certificate // - CORBA::Octet *der_cert = + CORBA::Octet *der_cert = attribute_returned.value.get_buffer(); // - // Convert the DER encoded certificate into + // Convert the DER encoded certificate into // OpenSSL's internal format. // - X509 *peer = ::d2i_X509 (0, - &der_cert, + X509 *peer = ::d2i_X509 (0, + &der_cert, attribute_returned.value.length()); - ::X509_NAME_oneline(::X509_get_subject_name (peer), - name_buf, + ::X509_NAME_oneline(::X509_get_subject_name (peer), + name_buf, BUFSIZ); ::X509_free(peer); diff --git a/TAO/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp b/TAO/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp index 954df24b0fc..d5ac902909d 100644 --- a/TAO/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp +++ b/TAO/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp @@ -1,7 +1,7 @@ /* -*- C++ -*- $Id$ */ -#include <ace/OS.h> -#include <ace/Get_Opt.h> +#include "ace/OS.h" +#include "ace/Get_Opt.h" #include "MessengerC.h" #include "orbsvcs/SecurityC.h" diff --git a/TAO/DevGuideExamples/SmartProxies/Logger_i.cpp b/TAO/DevGuideExamples/SmartProxies/Logger_i.cpp index 32c45af59a7..af83c40edea 100644 --- a/TAO/DevGuideExamples/SmartProxies/Logger_i.cpp +++ b/TAO/DevGuideExamples/SmartProxies/Logger_i.cpp @@ -1,7 +1,7 @@ // $Id$ #include "Logger_i.h" -#include <ace/OS_NS_time.h> +#include "ace/OS_NS_time.h" #include <iostream> Logger_i::Logger_i (void) diff --git a/TAO/DevGuideExamples/SmartProxies/Logger_i.h b/TAO/DevGuideExamples/SmartProxies/Logger_i.h index 280bf10fb51..4a4c9c4e612 100644 --- a/TAO/DevGuideExamples/SmartProxies/Logger_i.h +++ b/TAO/DevGuideExamples/SmartProxies/Logger_i.h @@ -4,7 +4,7 @@ #define LOGGERI_H_ #include "LoggerS.h" -#include <ace/String_Base.h> +#include "ace/String_Base.h" #include <fstream> #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/DevGuideExamples/ValueTypes/Bank/server.cpp b/TAO/DevGuideExamples/ValueTypes/Bank/server.cpp index 2cd24e3fe01..d05a787f5bc 100644 --- a/TAO/DevGuideExamples/ValueTypes/Bank/server.cpp +++ b/TAO/DevGuideExamples/ValueTypes/Bank/server.cpp @@ -5,7 +5,7 @@ #include "bankS.h" #include <tao/AnyTypeCode/TypeCode.h> -#include <ace/OS_NS_stdio.h> +#include "ace/OS_NS_stdio.h" #include <iostream> #include <fstream> #include <fstream> diff --git a/TAO/DevGuideExamples/ValueTypes/Notify/supplier.cpp b/TAO/DevGuideExamples/ValueTypes/Notify/supplier.cpp index 122a4227ee7..022c0defbfb 100644 --- a/TAO/DevGuideExamples/ValueTypes/Notify/supplier.cpp +++ b/TAO/DevGuideExamples/ValueTypes/Notify/supplier.cpp @@ -14,8 +14,8 @@ const char* notify_ior = "corbaloc::localhost:8888/NotifyEventChannelFactory"; #include <tao/corba.h> #include <tao/ORB_Core.h> -#include <ace/Reactor.h> -#include <ace/Event_Handler.h> +#include "ace/Reactor.h" +#include "ace/Event_Handler.h" #include <iostream> #include <stdexcept> |