diff options
52 files changed, 179 insertions, 118 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 977ff2379e4..8b61b867c3c 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,59 @@ +Wed Mar 31 23:16:00 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * examples/Borland/ChatClient.cpp: + * examples/Borland/ORBThread.h: + * examples/Borland/pch.h: + * examples/Kokyu_dsrt_schedulers/EDF_Scheduling.pidl: + * examples/Kokyu_dsrt_schedulers/FP_Scheduling.idl: + * examples/Kokyu_dsrt_schedulers/Kokyu_qos.idl: + * examples/Kokyu_dsrt_schedulers/MIF_Scheduling.idl: + * examples/Kokyu_dsrt_schedulers/MUF_Scheduling.idl: + * examples/RTScheduling/FP_Scheduling.pidl: + * examples/RTScheduling/MIF_Scheduling.pidl: + * orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp: + * orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp: + * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp: + * orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp: + * orbsvcs/FT_ReplicationManager/FT_ReplicationManager_Main.cpp: + * orbsvcs/Fault_Detector/Fault_Detector_Main.cpp: + * orbsvcs/Fault_Detector/Fault_Detector_i.cpp: + * orbsvcs/Fault_Notifier/FT_Notifier_i.cpp: + * orbsvcs/Fault_Notifier/Fault_Notifier_Main.cpp: + * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc: + * orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc: + * orbsvcs/examples/RtEC/Kokyu/RtECKokyu.mpc: + * orbsvcs/orbsvcs/PortableGroup.idl: + * orbsvcs/orbsvcs/PortableGroup_Simple_DS.idl: + * orbsvcs/orbsvcs/SSLIOP.idl: + * orbsvcs/orbsvcs/Security.idl: + * orbsvcs/orbsvcs/SecurityReplaceable.idl: + * orbsvcs/orbsvcs/miop.idl: + * orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h: + * orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp: + * orbsvcs/tests/FT_App/FTAPP_Analyzer_Main.cpp: + * orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp: + * orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp: + * orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp: + * orbsvcs/tests/FT_App/FT_Replica.cpp: + * orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp: + * orbsvcs/tests/FT_App/FT_TestReplica_i.cpp: + * orbsvcs/tests/FT_App/StubBatchConsumer.cpp: + * orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp: + * orbsvcs/tests/FT_App/StubFaultConsumer.cpp: + * orbsvcs/tests/FT_App/StubFaultNotifier.cpp: + * performance-tests/POA/Demux/demux_stats.cpp: + * tao/orb.idl: + * tao/PortableServer/Default_ORT.pidl: + * tao/RTPortableServer/RTPortableServer.pidl: + * tao/Utils/Server_Main.cpp: + * tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.h: + * tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.h: + * tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_Factory.h: + + Fixed fuzz warnings. + Wed Mar 31 18:19:54 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> * docs/releasenotes/ftcorba_services.html: diff --git a/TAO/examples/Borland/ChatClient.cpp b/TAO/examples/Borland/ChatClient.cpp index 82ec1e253d3..d3090a82aa1 100644 --- a/TAO/examples/Borland/ChatClient.cpp +++ b/TAO/examples/Borland/ChatClient.cpp @@ -2,8 +2,8 @@ //--------------------------------------------------------------------------- #include "pch.h" #pragma hdrstop -#include <ace/ace.h> -#include <tao/corba.h> +#include "ace/ace.h" +#include "tao/corba.h" #include "ChatClientWnd.h" USERES("ChatClient.res"); USEFORM("ChatClientWnd.cpp", ChatClientWindow); diff --git a/TAO/examples/Borland/ORBThread.h b/TAO/examples/Borland/ORBThread.h index 3442ba9d2de..fb680fcc8fe 100644 --- a/TAO/examples/Borland/ORBThread.h +++ b/TAO/examples/Borland/ORBThread.h @@ -3,7 +3,7 @@ #ifndef ORBThreadH #define ORBThreadH //--------------------------------------------------------------------------- -#include <tao/ORB.h> +#include "tao/ORB.h" //--------------------------------------------------------------------------- class PACKAGE TORBThread : public TThread { diff --git a/TAO/examples/Borland/pch.h b/TAO/examples/Borland/pch.h index d96c064323b..b890766880e 100644 --- a/TAO/examples/Borland/pch.h +++ b/TAO/examples/Borland/pch.h @@ -3,6 +3,6 @@ #define INCLUDE_PCH_H #include "ace/config-all.h" -#include <tao/corbafwd.h> +#include "tao/corbafwd.h" #endif diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduling.pidl b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduling.pidl index 4f16c754a6e..4a21e9eaefb 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduling.pidl +++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduling.pidl @@ -36,8 +36,8 @@ * */ -#include <tao/RTScheduling/RTScheduler.pidl> -#include <tao/RTCORBA/RTCORBA.pidl> +#include "tao/RTScheduling/RTScheduler.pidl" +#include "tao/RTCORBA/RTCORBA.pidl" module EDF_Scheduling { diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduling.idl b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduling.idl index ae7d9dad82f..61e89c4898f 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduling.idl +++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduling.idl @@ -36,8 +36,8 @@ * */ -#include <tao/RTScheduling/RTScheduler_include.pidl> -#include <tao/RTCORBA/RTCORBA_include.pidl> +#include "tao/RTScheduling/RTScheduler_include.pidl" +#include "tao/RTCORBA/RTCORBA_include.pidl" module FP_Scheduling { diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Kokyu_qos.idl b/TAO/examples/Kokyu_dsrt_schedulers/Kokyu_qos.idl index df8607d686d..4001a937823 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/Kokyu_qos.idl +++ b/TAO/examples/Kokyu_dsrt_schedulers/Kokyu_qos.idl @@ -35,8 +35,8 @@ #ifndef _KOKYU_DSRT_QOS_PIDL_ #define _KOKYU_DSRT_QOS_PIDL_ -#include <tao/TimeBase.pidl> -#include <tao/RTCORBA/RTCORBA_include.pidl> +#include "tao/TimeBase.pidl" +#include "tao/RTCORBA/RTCORBA_include.pidl" #pragma prefix "omg.org" diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduling.idl b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduling.idl index 69c0c7b3dca..f0bd37090b7 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduling.idl +++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduling.idl @@ -36,8 +36,8 @@ * */ -#include <tao/RTScheduling/RTScheduler_include.pidl> -#include <tao/RTCORBA/RTCORBA_include.pidl> +#include "tao/RTScheduling/RTScheduler_include.pidl" +#include "tao/RTCORBA/RTCORBA_include.pidl" module MIF_Scheduling { diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduling.idl b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduling.idl index c9bb4d96870..98924357866 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduling.idl +++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduling.idl @@ -36,8 +36,8 @@ * */ -#include <tao/RTScheduling/RTScheduler_include.pidl> -#include <tao/RTCORBA/RTCORBA_include.pidl> +#include "tao/RTScheduling/RTScheduler_include.pidl" +#include "tao/RTCORBA/RTCORBA_include.pidl" module MUF_Scheduling { diff --git a/TAO/examples/RTScheduling/FP_Scheduling.pidl b/TAO/examples/RTScheduling/FP_Scheduling.pidl index 8868d9e4808..ae50248097d 100644 --- a/TAO/examples/RTScheduling/FP_Scheduling.pidl +++ b/TAO/examples/RTScheduling/FP_Scheduling.pidl @@ -1,6 +1,6 @@ //$Id$ -#include <tao/RTScheduling/RTScheduler.pidl> -#include <tao/RTCORBA/RTCORBA.pidl> +#include "tao/RTScheduling/RTScheduler.pidl" +#include "tao/RTCORBA/RTCORBA.pidl" module FP_Scheduling { diff --git a/TAO/examples/RTScheduling/MIF_Scheduling.pidl b/TAO/examples/RTScheduling/MIF_Scheduling.pidl index f855284edc7..79e4a7a7054 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduling.pidl +++ b/TAO/examples/RTScheduling/MIF_Scheduling.pidl @@ -1,6 +1,6 @@ //$Id$ -#include <tao/RTScheduling/RTScheduler.pidl> -#include <tao/RTCORBA/RTCORBA.pidl> +#include "tao/RTScheduling/RTScheduler.pidl" +#include "tao/RTCORBA/RTCORBA.pidl" module MIF_Scheduling { diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp index 06834e6126a..c1c9cec8356 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp @@ -17,7 +17,7 @@ #include "orbsvcs/orbsvcs/FT_FaultDetectorFactoryC.h" #include "orbsvcs/orbsvcs/FT_ReplicationManagerC.h" #include "orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h" -#include <tao/debug.h> +#include "tao/debug.h" ACE_RCSID (FT_DefaultFaultAnalyzer, FT_DefaultFaultAnalyzer, diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp index a988aa4c917..68c97c8833e 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp @@ -19,7 +19,7 @@ #include "FT_FaultConsumer.h" #include "orbsvcs/orbsvcs/FT_ReplicationManagerC.h" #include "orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h" -#include <tao/debug.h> +#include "tao/debug.h" ACE_RCSID (FT_FaultConsumer, FT_FaultConsumer, diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp index cf289d8bad8..b42e0e28b4a 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp @@ -15,20 +15,20 @@ #include "FT_ReplicationManager.h" #include "FT_Property_Validator.h" -#include <ace/Get_Opt.h> -#include <ace/OS_NS_stdio.h> -#include <tao/Messaging/Messaging.h> -#include <tao/IORTable/IORTable.h> -#include <tao/debug.h> -#include <tao/ORB_Constants.h> -#include <orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h> -#include <orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h> -#include <orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h> -#include <orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h> -#include <orbsvcs/orbsvcs/PortableGroup/PG_conf.h> - -#include <orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h> -#include <orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h> +#include "ace/Get_Opt.h" +#include "ace/OS_NS_stdio.h" +#include "tao/Messaging/Messaging.h" +#include "tao/IORTable/IORTable.h" +#include "tao/debug.h" +#include "tao/ORB_Constants.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h" + +#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h" +#include "orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h" ACE_RCSID (FT_ReplicationManager, FT_ReplicationManager, diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp index 3fd0ed9edf4..c20989af25a 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp @@ -19,7 +19,7 @@ #include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h" #include "orbsvcs/orbsvcs/PortableGroup/PG_Operators.h" #include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h" -#include <tao/debug.h> +#include "tao/debug.h" #include <iostream> ACE_RCSID (FT_ReplicationManagerFaultAnalyzer, diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager_Main.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager_Main.cpp index 36b0a4962e1..e9f7c21a9a4 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager_Main.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager_Main.cpp @@ -14,7 +14,7 @@ //============================================================================= #include "FT_ReplicationManager.h" -#include <tao/Utils/Server_Main.h> +#include "tao/Utils/Server_Main.h" int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector_Main.cpp b/TAO/orbsvcs/Fault_Detector/Fault_Detector_Main.cpp index e8585c9764a..43bbc02813f 100644 --- a/TAO/orbsvcs/Fault_Detector/Fault_Detector_Main.cpp +++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector_Main.cpp @@ -14,7 +14,7 @@ */ //============================================================================= -#include <tao/Utils/Server_Main.h> +#include "tao/Utils/Server_Main.h" #include "FT_FaultDetectorFactory_i.h" int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp index b59e178dcd0..0b9a7cbd3b2 100644 --- a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp +++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp @@ -13,7 +13,7 @@ //============================================================================= #include "Fault_Detector_i.h" #include "FT_FaultDetectorFactory_i.h" -#include <tao/debug.h> +#include "tao/debug.h" /////////////////////////////// // Fault_Detector_i static data diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp index 26f51460da2..abab6c790a5 100644 --- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp +++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp @@ -13,9 +13,9 @@ #include "FT_Notifier_i.h" -#include <ace/Get_Opt.h> -#include <ace/OS_NS_stdio.h> -#include <tao/debug.h> +#include "ace/Get_Opt.h" +#include "ace/OS_NS_stdio.h" +#include "tao/debug.h" // Use this macro at the beginning of CORBA methods // to aid in debugging. diff --git a/TAO/orbsvcs/Fault_Notifier/Fault_Notifier_Main.cpp b/TAO/orbsvcs/Fault_Notifier/Fault_Notifier_Main.cpp index 52cbdd95954..6e75bb8bcab 100644 --- a/TAO/orbsvcs/Fault_Notifier/Fault_Notifier_Main.cpp +++ b/TAO/orbsvcs/Fault_Notifier/Fault_Notifier_Main.cpp @@ -14,7 +14,7 @@ */ //============================================================================= -#include <tao/Utils/Server_Main.h> +#include "tao/Utils/Server_Main.h" #include "FT_Notifier_i.h" int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc index bacdcf0dfb6..3756a9e0726 100644 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc @@ -1,3 +1,4 @@ +// $Id$ project: namingexe, rteventlogadmin { includes += $(TAO_ROOT)/orbsvcs -}
\ No newline at end of file +} diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc index d4779b26ff9..396f6695099 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc @@ -1,3 +1,4 @@ +// $Id$ project(*Server): orbsvcsexe, fault_tolerance, tmcast { requires += interceptors includes += $(TAO_ROOT)/orbsvcs diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/RtECKokyu.mpc b/TAO/orbsvcs/examples/RtEC/Kokyu/RtECKokyu.mpc index 4f6c956d27a..4c3885cc624 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/RtECKokyu.mpc +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/RtECKokyu.mpc @@ -1,3 +1,4 @@ +// $Id$ project: orbsvcsexe, rtkokyuevent { includes += $(TAO_ROOT)/orbsvcs $(TAO_ROOT)/orbsvcs/orbsvcs/Sched -}
\ No newline at end of file +} diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.idl b/TAO/orbsvcs/orbsvcs/PortableGroup.idl index ca1e7853414..e2a76808691 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup.idl +++ b/TAO/orbsvcs/orbsvcs/PortableGroup.idl @@ -12,8 +12,8 @@ #define _PORTABLEGROUP_IDL_ #include "CosNaming.idl" -#include <tao/IOP.pidl> -#include <tao/GIOP.pidl> +#include "tao/IOP.pidl" +#include "tao/GIOP.pidl" #include <orb.idl> #include "PortableGroup_Simple_DS.idl" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp index cdc19b3d935..b2664be412e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp @@ -4,12 +4,12 @@ #include "PG_FactoryRegistry.h" -#include <ace/Get_Opt.h> -#include <ace/Vector_T.h> -#include <ace/OS_NS_stdio.h> -#include <tao/debug.h> -#include <tao/ORB_Constants.h> -#include <tao/PortableServer/ORB_Manager.h> +#include "ace/Get_Opt.h" +#include "ace/Vector_T.h" +#include "ace/OS_NS_stdio.h" +#include "tao/debug.h" +#include "tao/ORB_Constants.h" +#include "tao/PortableServer/ORB_Manager.h" #include "PG_Operators.h" // operator == on CosNaming::Name // Use this macro at the beginning of CORBA methods diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp index e10111e23fb..35259445c96 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp @@ -5,12 +5,12 @@ #include "PG_Object_Group.h" #include "PG_conf.h" -#include <ace/Get_Opt.h> -#include <ace/Vector_T.h> -#include <tao/debug.h> -#include <tao/PortableServer/ORB_Manager.h> -#include <orbsvcs/orbsvcs/PortableGroup/PG_Operators.h> // Borrow operator == on CosNaming::Name -#include <orbsvcs/orbsvcs/PortableGroup/PG_Utils.h> +#include "ace/Get_Opt.h" +#include "ace/Vector_T.h" +#include "tao/debug.h" +#include "tao/PortableServer/ORB_Manager.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Operators.h" // Borrow operator == on CosNaming::Name +#include "orbsvcs/orbsvcs/PortableGroup/PG_Utils.h" // Borland C++ 6 Update Pack 4 and earlier give a warning about comparing // signed and unsigned values in the minimum_polulate() and diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h index 56c928ccf91..09ae9b5d8af 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h @@ -18,8 +18,9 @@ #ifndef TAO_PG_OBJECT_GROUP_H_ #define TAO_PG_OBJECT_GROUP_H_ -#include /**/ <ace/pre.h> -#include <ace/ACE.h> +#include /**/ "ace/pre.h" + +#include "ace/ACE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once @@ -37,9 +38,9 @@ namespace TAO ///////////////////////////////// // Includes needed by this header -#include <orbsvcs/orbsvcs/PortableGroupC.h> -#include <tao/PortableServer/PortableServer.h> -#include <ace/Hash_Map_Manager_T.h> +#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "tao/PortableServer/PortableServer.h" +#include "ace/Hash_Map_Manager_T.h" #include "PG_Location_Hash.h" #include "PG_Location_Equal_To.h" #include "PG_Object_Group_Manipulator.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp index ac45fa02e59..1b53912826c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp @@ -15,7 +15,7 @@ */ //============================================================================= #include "PG_Property_Set.h" -#include <tao/debug.h> +#include "tao/debug.h" ////////////////////// // PG_Property_Set diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup_Simple_DS.idl b/TAO/orbsvcs/orbsvcs/PortableGroup_Simple_DS.idl index 1d3e4c656a7..5da9ea78453 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup_Simple_DS.idl +++ b/TAO/orbsvcs/orbsvcs/PortableGroup_Simple_DS.idl @@ -18,7 +18,7 @@ #ifndef _PORTABLEGROUP_SIMPLE_DS_IDL_ #define _PORTABLEGROUP_SIMPLE_DS_IDL_ -#include <tao/GIOP.pidl> +#include "tao/GIOP.pidl" module PortableGroup { diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP.idl b/TAO/orbsvcs/orbsvcs/SSLIOP.idl index fb0a99d86c0..ba4f9c406b6 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP.idl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP.idl @@ -9,8 +9,8 @@ #ifndef _SSLIOP_IDL #define _SSLIOP_IDL -#include <tao/IOP.pidl> -#include <Security.idl> +#include "tao/IOP.pidl" +#include "Security.idl" // #include <Firewall.idl> #pragma prefix "omg.org" diff --git a/TAO/orbsvcs/orbsvcs/Security.idl b/TAO/orbsvcs/orbsvcs/Security.idl index 1473c95af23..836462ec784 100644 --- a/TAO/orbsvcs/orbsvcs/Security.idl +++ b/TAO/orbsvcs/orbsvcs/Security.idl @@ -6,7 +6,7 @@ #ifndef _SECURITY_IDL_ #define _SECURITY_IDL_ -#include <tao/TimeBase.pidl> +#include "tao/TimeBase.pidl" #include <orb.idl> #pragma prefix "omg.org" diff --git a/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl b/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl index f8b157cc92a..29cc213313d 100644 --- a/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl +++ b/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl @@ -5,8 +5,8 @@ #ifndef _SECURITY_REPLACEABLE_IDL_ #define _SECURITY_REPLACEABLE_IDL_ -#include <orbsvcs/orbsvcs/SecurityLevel2.idl> -#include <tao/IOP.pidl> +#include "orbsvcs/orbsvcs/SecurityLevel2.idl" +#include "tao/IOP.pidl" #pragma prefix "omg.org" diff --git a/TAO/orbsvcs/orbsvcs/miop.idl b/TAO/orbsvcs/orbsvcs/miop.idl index d4db1fe04b9..b539dd7154a 100644 --- a/TAO/orbsvcs/orbsvcs/miop.idl +++ b/TAO/orbsvcs/orbsvcs/miop.idl @@ -19,8 +19,8 @@ #ifndef MIOP_IDL #define MIOP_IDL -#include <tao/IOP.pidl> -#include <tao/GIOP.pidl> +#include "tao/IOP.pidl" +#include "tao/GIOP.pidl" #pragma prefix "omg.org" diff --git a/TAO/orbsvcs/tests/FT_App/FTAPP_Analyzer_Main.cpp b/TAO/orbsvcs/tests/FT_App/FTAPP_Analyzer_Main.cpp index 36657366c10..b524714af14 100644 --- a/TAO/orbsvcs/tests/FT_App/FTAPP_Analyzer_Main.cpp +++ b/TAO/orbsvcs/tests/FT_App/FTAPP_Analyzer_Main.cpp @@ -12,7 +12,7 @@ */ //============================================================================= -#include <tao/Utils/Server_Main.h> +#include "tao/Utils/Server_Main.h" #include "StubFaultAnalyzer.h" int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp b/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp index 9f5c9a92aac..7416446bbe6 100644 --- a/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp +++ b/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp @@ -12,8 +12,8 @@ */ //============================================================================= -#include <tao/Utils/Server_Main.h> -#include <orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h> +#include "tao/Utils/Server_Main.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h" int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp b/TAO/orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp index 01f79422633..b7483c720a5 100644 --- a/TAO/orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp +++ b/TAO/orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp @@ -12,7 +12,7 @@ */ //============================================================================= -#include <tao/Utils/Server_Main.h> +#include "tao/Utils/Server_Main.h" #include "ReplicationManagerFaultConsumerAdapter.h" int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp b/TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp index 9c89038cdbb..5d2a711be7f 100644 --- a/TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp +++ b/TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp @@ -14,7 +14,7 @@ //============================================================================= #include "StubFaultNotifier.h" -#include <tao/Utils/Server_Main.h> +#include "tao/Utils/Server_Main.h" int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/FT_App/FT_Replica.cpp b/TAO/orbsvcs/tests/FT_App/FT_Replica.cpp index 43bd2b8b219..89207939115 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Replica.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Replica.cpp @@ -12,7 +12,7 @@ */ //============================================================================= -#include <tao/Utils/Server_Main.h> +#include "tao/Utils/Server_Main.h" #include "FT_ReplicaFactory_i.h" int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp index c608a890b89..5e5e280aec5 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp @@ -12,11 +12,11 @@ //============================================================================= #include "FT_ReplicaFactory_i.h" #include "FT_TestReplica_i.h" -#include <ace/Get_Opt.h> -#include <orbsvcs/orbsvcs/CosNamingC.h> -#include <orbsvcs/orbsvcs/PortableGroupC.h> -#include <tao/PortableServer/ORB_Manager.h> -#include <orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h> +#include "ace/Get_Opt.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "tao/PortableServer/ORB_Manager.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h" // Use this macro at the beginning of CORBA methods // to aid in debugging. diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp index f3929aabbbe..2678c78cdd6 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp @@ -15,8 +15,8 @@ #include "FT_TestReplica_i.h" #include "FT_ReplicaFactory_i.h" -#include <tao/PortableServer/ORB_Manager.h> -#include <tao/ORB_Constants.h> +#include "tao/PortableServer/ORB_Manager.h" +#include "tao/ORB_Constants.h" #include "FT_TestReplicaC.h" // FUZZ: disable check_for_streams_include #include "ace/streams.h" diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp index 630c15e2456..f2bec9e8df6 100644 --- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp @@ -3,9 +3,9 @@ // $Id$ #include "StubBatchConsumer.h" -#include <ace/Get_Opt.h> -#include <tao/PortableServer/ORB_Manager.h> -#include <orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h> +#include "ace/Get_Opt.h" +#include "tao/PortableServer/ORB_Manager.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h" StubBatchConsumer::StubBatchConsumer () : quit_(0) diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp index f0cd42c8c18..cbcb441ae9e 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp @@ -3,9 +3,9 @@ // $Id$ #include "StubFaultAnalyzer.h" -#include <ace/Get_Opt.h> -#include <tao/PortableServer/ORB_Manager.h> -#include <orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h> +#include "ace/Get_Opt.h" +#include "tao/PortableServer/ORB_Manager.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h" // FUZZ: disable check_for_streams_include #include "ace/streams.h" diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp index e87352717bc..016f086f327 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp @@ -3,9 +3,9 @@ // $Id$ #include "StubFaultConsumer.h" -#include <ace/Get_Opt.h> -#include <tao/PortableServer/ORB_Manager.h> -#include <orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h> +#include "ace/Get_Opt.h" +#include "tao/PortableServer/ORB_Manager.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h" StubFaultConsumer::StubFaultConsumer () : quit_(0) diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp index 6062e86afce..8281ae33845 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp @@ -3,10 +3,10 @@ // $Id$ #include "StubFaultNotifier.h" -#include <ace/Get_Opt.h> -#include <ace/OS_NS_stdio.h> -#include <tao/PortableServer/ORB_Manager.h> -#include <orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h> +#include "ace/Get_Opt.h" +#include "ace/OS_NS_stdio.h" +#include "tao/PortableServer/ORB_Manager.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h" // FUZZ: disable check_for_streams_include #include "ace/streams.h" diff --git a/TAO/performance-tests/POA/Demux/demux_stats.cpp b/TAO/performance-tests/POA/Demux/demux_stats.cpp index 1a1bf0dbb8a..fae7f9c0d20 100644 --- a/TAO/performance-tests/POA/Demux/demux_stats.cpp +++ b/TAO/performance-tests/POA/Demux/demux_stats.cpp @@ -15,8 +15,8 @@ // FUZZ: disable check_for_math_include #include <math.h> -#include <ace/Get_Opt.h> -#include <tao/corba.h> +#include "ace/Get_Opt.h" +#include "tao/corba.h" class Demux_Stats { diff --git a/TAO/tao/PortableServer/Default_ORT.pidl b/TAO/tao/PortableServer/Default_ORT.pidl index eaa6a5ebb8d..2b44fdd1416 100644 --- a/TAO/tao/PortableServer/Default_ORT.pidl +++ b/TAO/tao/PortableServer/Default_ORT.pidl @@ -38,7 +38,7 @@ #ifndef TAO_DEFAULT_ORT_PIDL #define TAO_DEFAULT_ORT_PIDL -#include <tao/ObjRefTemplate/ObjectReferenceTemplate.pidl> +#include "tao/ObjRefTemplate/ObjectReferenceTemplate.pidl" module TAO_Default_ORT { diff --git a/TAO/tao/RTPortableServer/RTPortableServer.pidl b/TAO/tao/RTPortableServer/RTPortableServer.pidl index c330015ba0a..3d8ab54f121 100644 --- a/TAO/tao/RTPortableServer/RTPortableServer.pidl +++ b/TAO/tao/RTPortableServer/RTPortableServer.pidl @@ -34,8 +34,8 @@ #ifndef _RT_PORTABLE_SERVER_IDL_ #define _RT_PORTABLE_SERVER_IDL_ -#include <tao/PortableServer/PortableServer.pidl> -#include <tao/RTCORBA/RTCORBA.pidl> +#include "tao/PortableServer/PortableServer.pidl" +#include "tao/RTCORBA/RTCORBA.pidl" #pragma prefix "omg.org" diff --git a/TAO/tao/Utils/Server_Main.cpp b/TAO/tao/Utils/Server_Main.cpp index a90f575e093..3cd07cc85f7 100644 --- a/TAO/tao/Utils/Server_Main.cpp +++ b/TAO/tao/Utils/Server_Main.cpp @@ -21,9 +21,9 @@ ACE_RCSID(Utils, Server_Main, "$Id$") -#include <ace/Argv_Type_Converter.h> -#include <ace/Log_Msg.h> -#include <tao/ORB.h> +#include "ace/Argv_Type_Converter.h" +#include "ace/Log_Msg.h" +#include "tao/ORB.h" template <typename SERVANT> TAO::Utils::Server_Main<SERVANT>::Server_Main(const char * name) diff --git a/TAO/tao/orb.idl b/TAO/tao/orb.idl index 10254cdf91f..4cd6037a537 100644 --- a/TAO/tao/orb.idl +++ b/TAO/tao/orb.idl @@ -7,6 +7,7 @@ #ifndef TAO_ORB_IDL #define TAO_ORB_IDL +///FUZZ: disable check_for_include/ #include <tao/OctetSeq.pidl> #include <tao/StringSeq.pidl> diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.h b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.h index dce9d7fb5d2..272fe76a29a 100644 --- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.h +++ b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.h @@ -22,9 +22,9 @@ #ifndef CHAR_IBM1047_ISO8859_FACTORY_H #define CHAR_IBM1047_ISO8859_FACTORY_H -#include <ace/pre.h> -#include <ace/Service_Config.h> -#include <tao/Codeset_Translator_Factory.h> +#include /**/ "ace/pre.h" +#include "ace/Service_Config.h" +#include "tao/Codeset_Translator_Factory.h" #include "IBM1047_ISO8859_export.h" #include "Char_IBM1047_ISO8859_Translator.h" @@ -34,6 +34,6 @@ typedef IBM1047_ISO8859_Export TAO_Codeset_Translator_Factory_T<IBM1047_ISO8859> ACE_STATIC_SVC_DECLARE_EXPORT (IBM1047_ISO8859, Char_IBM1047_ISO8859_Factory) ACE_FACTORY_DECLARE (IBM1047_ISO8859, Char_IBM1047_ISO8859_Factory) -#include <ace/post.h> +#include /**/ "ace/post.h" #endif /* TAO_CHAR_IBM1047_ISO8859_FACTORY_H */ diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.h b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.h index 2fe1f40543e..966d0992b1a 100644 --- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.h +++ b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.h @@ -23,9 +23,9 @@ #ifndef WCHAR_IBM1047_ISO8859_FACTORY_H #define WCHAR_IBM1047_ISO8859_FACTORY_H -#include <ace/pre.h> -#include <ace/Service_Config.h> -#include <tao/Codeset_Translator_Factory.h> +#include /**/ "ace/pre.h" +#include "ace/Service_Config.h" +#include "tao/Codeset_Translator_Factory.h" #include "IBM1047_ISO8859_export.h" #include "Wchar_IBM1047_ISO8859_Translator.h" @@ -35,6 +35,6 @@ typedef IBM1047_ISO8859_Export TAO_Codeset_Translator_Factory_T<WIBM1047_ISO8859 ACE_STATIC_SVC_DECLARE_EXPORT (IBM1047_ISO8859, Wchar_IBM1047_ISO8859_Factory) ACE_FACTORY_DECLARE (IBM1047_ISO8859, Wchar_IBM1047_ISO8859_Factory) -#include <ace/post.h> +#include /**/ "ace/post.h" #endif /* WCHAR_IBM1047_ISO8859_FACTORY_H */ diff --git a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_Factory.h b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_Factory.h index 666f61fee1d..d3218c5a913 100644 --- a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_Factory.h +++ b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_Factory.h @@ -14,9 +14,9 @@ #ifndef WUCS4_UTF16_FACTORY_H #define WUCS4_UTF16_FACTORY_H -#include <ace/pre.h> -#include <ace/Service_Config.h> -#include <tao/Codeset_Translator_Factory.h> +#include /**/ "ace/pre.h" +#include "ace/Service_Config.h" +#include "tao/Codeset_Translator_Factory.h" #include "WUCS4_UTF16_export.h" #include "WUCS4_UTF16.h" @@ -26,5 +26,5 @@ typedef UCS4_UTF16_Export TAO_Codeset_Translator_Factory_T<WUCS4_UTF16> WUCS4_UT ACE_STATIC_SVC_DECLARE_EXPORT (UCS4_UTF16, WUCS4_UTF16_Factory) ACE_FACTORY_DECLARE (UCS4_UTF16, WUCS4_UTF16_Factory) -#include <ace/post.h> +#include /**/ "ace/post.h" #endif /* WUCS4_UTF16_FACTORY_H */ |