diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-05-09 07:36:18 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-05-09 07:36:18 +0000 |
| commit | 6e168d953b01bf2db57efe5449c4d91ec747907a (patch) | |
| tree | 1fb3a1fd34f5827ecf79bee0b1411070e59616cb | |
| parent | c4e12d900addca2ec48d84f7a35e8b62c5de9cc7 (diff) | |
| download | ATCD-6e168d953b01bf2db57efe5449c4d91ec747907a.tar.gz | |
ChangeLogTag: Tue May 10 07:18:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
116 files changed, 215 insertions, 332 deletions
diff --git a/ChangeLog b/ChangeLog index d8488be78a4..eea885092c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +Tue May 9 07:25:30 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Condition_T.{h,cpp,inl}: + * ace/Local_Name_Space_T.cpp: + * ace/Configuration.cpp: + * ace/Sched_Params.cpp: + * ace/Mutex.{h,cpp,inl}: + * ace/Select_Reactor_T.cpp: + * ace/Signal.cpp: + Removed Chorus support + + * ace/CDR_Stream.cpp: + Small layout change + + * ace/Event_Handler.cpp: + Removed psos support + + * ace/Message_Block.h: + Doxygen improvements + + * ace/Message_Block.cpp: + Const improvement + Sun May 7 21:03:30 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> * ace/Service_Config.{h,cpp}: @@ -27,7 +27,7 @@ USER VISIBLE CHANGES BETWEEN TAO-1.5.1 and TAO-1.5.2 ==================================================== . Allow different ORB instances to use a different sets of Service - Objects in their own Service REpository instances. This resolves + Objects in their own Service Repository instances. This resolves bugzilla #2486. . Integrate new sequence implementation made by Carlos O'Ryan. This @@ -40,6 +40,10 @@ USER VISIBLE CHANGES BETWEEN TAO-1.5.1 and TAO-1.5.2 . Add on demand write functionality that writes out GIOP fragments to reduce the memory usage +. The TIE files (_S.*) are not generated by default anymore by the + IDL compiler. If you need these for your project, add -GT to the + idl compiler flags. + USER VISIBLE CHANGES BETWEEN TAO-1.5 and TAO-1.5.1 ==================================================== diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp index 0385f93b7fc..41e7ae0fbce 100644 --- a/TAO/TAO_IDL/be/be_global.cpp +++ b/TAO/TAO_IDL/be/be_global.cpp @@ -84,7 +84,7 @@ BE_GlobalData::BE_GlobalData (void) opt_tc_ (false), ami_call_back_ (false), gen_amh_classes_ (false), - gen_tie_classes_ (true), + gen_tie_classes_ (false), gen_smart_proxies_ (false), gen_inline_constants_ (true), gen_dcps_type_support_ (false), @@ -1557,6 +1557,11 @@ BE_GlobalData::parse_args (long &i, char **av) // AMI with Call back. be_global->ami_call_back (true); } + else if (av[i][2] == 'T') + { + // Generate tie classes and files + be_global->gen_tie_classes (true); + } else if (av[i][2] == 'H') { // AMH classes. @@ -1776,11 +1781,6 @@ BE_GlobalData::parse_args (long &i, char **av) // no client inline be_global->gen_client_inline (false); } - else - { - // suppress generating tie classes and files - be_global->gen_tie_classes (0); - } } else if (av[i][2] == 'm') { @@ -2174,6 +2174,11 @@ BE_GlobalData::usage (void) const )); ACE_DEBUG (( LM_DEBUG, + ACE_TEXT (" -GT\t\t\tgenerate tie class (and file)") + ACE_TEXT (" generation (disabled by default)\n") + )); + ACE_DEBUG (( + LM_DEBUG, ACE_TEXT (" \t\t\tNo effect if TypeCode generation is suppressed\n") )); ACE_DEBUG (( @@ -2274,11 +2279,6 @@ BE_GlobalData::usage (void) const )); ACE_DEBUG (( LM_DEBUG, - ACE_TEXT (" -Sc\t\t\tsuppress tie class (and file)") - ACE_TEXT (" generation (enabled by default)\n") - )); - ACE_DEBUG (( - LM_DEBUG, ACE_TEXT (" -Sp\t\t\tsuppress generating Thru POA collocated") ACE_TEXT (" stubs (enabled by default)\n") )); diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html index 3bd5e56ad8b..951ce594a5d 100644 --- a/TAO/docs/compiler.html +++ b/TAO/docs/compiler.html @@ -169,7 +169,7 @@ configured using TAO's IDL compiler <A HREF="#options">options</A>.<P> <h3>AMI support</h3> The TAO_IDL compiler generates AMI stubs and skeletons as -described in the CORBA 3.0.3 specification. +described in the CORBA 3.0.3 specification. <hr><p> <h3><a name="collocation-stubs">Collocation Strategies</a></h3> @@ -734,6 +734,14 @@ also receives other options that are specific to it.<p> <td> </td> </tr> + <tr><a name="GT"> + <td><tt>-GT</tt></td> + + <td>Enable generation of the TIE classes, and the *S_T.* files that + contain them.</td> + <td> </td> + </tr> + <tr><a name="Sa"> <td><tt>-Sa</tt></td> @@ -764,13 +772,6 @@ also receives other options that are specific to it.<p> associated typecode.</td> </tr> - <tr><a name="Sc"> - <td><tt>-Sc</tt></td> - - <td>Suppress generation of the tie classes, and the *S_T.* files that contain them.</td> - <td> </td> - </tr> - <tr><a name="Sm"> <td><tt>-Sm</tt></td> diff --git a/TAO/examples/POA/TIE/POA_TIE.mpc b/TAO/examples/POA/TIE/POA_TIE.mpc index bb4d3be3634..e3213c6fb17 100644 --- a/TAO/examples/POA/TIE/POA_TIE.mpc +++ b/TAO/examples/POA/TIE/POA_TIE.mpc @@ -2,6 +2,7 @@ // $Id$ project(*IDL) : taoidldefaults { + idlflags += -GT IDL_Files { test.idl } diff --git a/TAO/tao/AnyTypeCode/AnySeq.pidl b/TAO/tao/AnyTypeCode/AnySeq.pidl index f5e60ba8edd..18cf94274d6 100644 --- a/TAO/tao/AnyTypeCode/AnySeq.pidl +++ b/TAO/tao/AnyTypeCode/AnySeq.pidl @@ -8,7 +8,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Ge 1 -Sc -GA -SS -Sci + * -o orig -Ge 1 -GA -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/AnyTypeCode/Bounds.pidl b/TAO/tao/AnyTypeCode/Bounds.pidl index 707ab2b8158..f0155c854ab 100644 --- a/TAO/tao/AnyTypeCode/Bounds.pidl +++ b/TAO/tao/AnyTypeCode/Bounds.pidl @@ -10,7 +10,7 @@ * following command: * * tao_idl - * -o orig -Ge 1 -GA -Sc -Sci + * -o orig -Ge 1 -GA -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include=TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/AnyTypeCode/Dynamic.pidl b/TAO/tao/AnyTypeCode/Dynamic.pidl index 6a15c71045e..48bd24f4971 100644 --- a/TAO/tao/AnyTypeCode/Dynamic.pidl +++ b/TAO/tao/AnyTypeCode/Dynamic.pidl @@ -10,7 +10,7 @@ * used to generate code is: * * tao_idl - * -o orig -Ge 1 -GA -Sc -SS -Sci + * -o orig -Ge 1 -GA -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl b/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl index 038b00daf99..aee0f76d991 100644 --- a/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl +++ b/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl @@ -10,7 +10,7 @@ * used to generate code is: * * tao_idl - * -o orig -Ge 1 -GA -Sc -Sci + * -o orig -Ge 1 -GA -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/AnyTypeCode/ValueModifier.pidl b/TAO/tao/AnyTypeCode/ValueModifier.pidl index 2887587dddd..794ac4af092 100644 --- a/TAO/tao/AnyTypeCode/ValueModifier.pidl +++ b/TAO/tao/AnyTypeCode/ValueModifier.pidl @@ -10,7 +10,7 @@ * used to generate code is: * * tao_idl - * -o orig -Ge 1 -Sc -SS -Sci -St + * -o orig -Ge 1 -SS -Sci -St * -Wb,export_macro=TAO_Export * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/AnyTypeCode/Visibility.pidl b/TAO/tao/AnyTypeCode/Visibility.pidl index 715b312bdf1..27f4f755c8b 100644 --- a/TAO/tao/AnyTypeCode/Visibility.pidl +++ b/TAO/tao/AnyTypeCode/Visibility.pidl @@ -10,7 +10,7 @@ * used to generate code is: * * tao_idl - * -o orig -SS -Ge 1 -Sc -Sci + * -o orig -SS -Ge 1 -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/BooleanSeq.pidl b/TAO/tao/BooleanSeq.pidl index d24060e24e3..34ad2ac2aa9 100644 --- a/TAO/tao/BooleanSeq.pidl +++ b/TAO/tao/BooleanSeq.pidl @@ -8,7 +8,7 @@ * * tao_idl * -oA AnyTypeCode - * -Ge 1 -GA -Sc -SS -Sci + * -Ge 1 -GA -SS -Sci * -Wb,pre_include=ace/pre.h * -Wb,post_include=ace/post.h * -Wb,export_macro=TAO_Export diff --git a/TAO/tao/CSD_Framework/CSD_Framework.pidl b/TAO/tao/CSD_Framework/CSD_Framework.pidl index b0e78b39331..e377b8057f3 100644 --- a/TAO/tao/CSD_Framework/CSD_Framework.pidl +++ b/TAO/tao/CSD_Framework/CSD_Framework.pidl @@ -10,7 +10,7 @@ * CSD_FrameworkC.{h,inl,cpp}, using the following command: * * $ACE_ROOT/bin/tao_idl \ - * -o orig -Gp -Gd -Ge 1 -Gt -Sc -GA -I$TAO_ROOT \ + * -o orig -Gp -Gd -Ge 1 -Gt -GA -I$TAO_ROOT \ * -Wb,export_macro=TAO_CSD_FW_Export \ * -Wb,export_include="CSD_FW_Export.h" \ * -Wb,pre_include="ace/pre.h" \ @@ -50,7 +50,7 @@ #include "tao/PortableServer/PortableServer.pidl" module CSD_Framework { - + # pragma version CSD_Framework 2.3 // This is a common base interface for all CSD strategy diff --git a/TAO/tao/CharSeq.pidl b/TAO/tao/CharSeq.pidl index a9a89c2735b..b5e93d86565 100644 --- a/TAO/tao/CharSeq.pidl +++ b/TAO/tao/CharSeq.pidl @@ -8,7 +8,7 @@ * * tao_idl * -oA AnyTypeCode - * -Ge 1 -GA -Sc -SS -Sci + * -Ge 1 -GA -SS -Sci * -Wb,pre_include=ace/pre.h * -Wb,post_include=ace/post.h * -Wb,export_macro=TAO_Export diff --git a/TAO/tao/CodecFactory/IOP_Codec.pidl b/TAO/tao/CodecFactory/IOP_Codec.pidl index be4caae91b3..ef3dd5a8dac 100644 --- a/TAO/tao/CodecFactory/IOP_Codec.pidl +++ b/TAO/tao/CodecFactory/IOP_Codec.pidl @@ -11,7 +11,7 @@ * command: * * tao_idl.exe - * -o orig -Gp -Gd -Ge 1 -Sc -SS -Sci + * -o orig -Gp -Gd -Ge 1 -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include=tao/TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/CodecFactory/IOP_Codec_include.pidl b/TAO/tao/CodecFactory/IOP_Codec_include.pidl index 7cb54a935a3..c98f6883e65 100644 --- a/TAO/tao/CodecFactory/IOP_Codec_include.pidl +++ b/TAO/tao/CodecFactory/IOP_Codec_include.pidl @@ -17,7 +17,7 @@ * 1. Run the tao_idl compiler on the pidl file. The command used for * this is: * - * tao_idl -o orig -St -Sc -Sp -Sci -SS + * tao_idl -o orig -St -Sp -Sci -SS * -Wb,export_macro=TAO_CodecFactory_Export \ * -Wb,export_include="tao/CodecFactory/codecfactory_export.h" \ * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/Current.pidl b/TAO/tao/Current.pidl index f90dcaddebf..643ffdc6914 100644 --- a/TAO/tao/Current.pidl +++ b/TAO/tao/Current.pidl @@ -9,7 +9,7 @@ * following command: * * tao_idl.exe - * -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci + * -o orig -Gp -Gd -Ge 1 -GA -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/DoubleSeq.pidl b/TAO/tao/DoubleSeq.pidl index f214a297fad..d9d603f0ca1 100644 --- a/TAO/tao/DoubleSeq.pidl +++ b/TAO/tao/DoubleSeq.pidl @@ -8,7 +8,7 @@ * * tao_idl * -oA AnyTypeCode - * -Ge 1 -GA -Sc -SS -Sci + * -Ge 1 -GA -SS -Sci * -Wb,pre_include=ace/pre.h * -Wb,post_include=ace/post.h * -Wb,export_macro=TAO_Export diff --git a/TAO/tao/DynamicAny/DynamicAny.pidl b/TAO/tao/DynamicAny/DynamicAny.pidl index 1a8fe09cc21..345f25bad8c 100644 --- a/TAO/tao/DynamicAny/DynamicAny.pidl +++ b/TAO/tao/DynamicAny/DynamicAny.pidl @@ -22,7 +22,7 @@ * The command used to generate code from this file is: * * tao_idl \ - * -o orig -Gp -Sci -Gd -Ge 1 -Sa -Sc -St -I../.. \ + * -o orig -Gp -Sci -Gd -Ge 1 -Sa -St -I../.. \ * -Wb,export_macro=TAO_DynamicAny_Export \ * -Wb,export_include=dynamicany_export.h \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy.pidl b/TAO/tao/EndpointPolicy/EndpointPolicy.pidl index 4b0fcede25f..cd3ddf893f0 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy.pidl +++ b/TAO/tao/EndpointPolicy/EndpointPolicy.pidl @@ -20,7 +20,7 @@ // is: /* $ACE_ROOT/bin/tao_idl \ - -Ge 1 -Sc \ + -Ge 1 \ -Wb,export_macro=TAO_EndpointPolicy_Export \ -Wb,export_include="tao/EndpointPolicy/EndpointPolicy_Export.h" \ -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/EndpointPolicy/EndpointPolicyType.pidl b/TAO/tao/EndpointPolicy/EndpointPolicyType.pidl index 2a07f2c886a..8fd9552767c 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicyType.pidl +++ b/TAO/tao/EndpointPolicy/EndpointPolicyType.pidl @@ -18,7 +18,7 @@ // is: // // tao_idl -// -o orig -Ge 1 -GA -Sc \ +// -o orig -Ge 1 -GA \ // -Wb,export_macro=TAO_EndpointPolicy_Export \ // -Wb,export_include="tao/EndpointPolicy/TAO_EndpointPolicy_Export.h" \ // -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/EndpointPolicy/IIOPEndpointValue.pidl b/TAO/tao/EndpointPolicy/IIOPEndpointValue.pidl index a1b97a957ad..d87c1aa0a79 100644 --- a/TAO/tao/EndpointPolicy/IIOPEndpointValue.pidl +++ b/TAO/tao/EndpointPolicy/IIOPEndpointValue.pidl @@ -20,7 +20,7 @@ // is: // // tao_idl -// -o orig -Ge 1 -GA -Sc \ +// -o orig -Ge 1 -GA \ // -Wb,export_macro=TAO_EndpointPolicy_Export \ // -Wb,export_include="tao/EndpointPolicy/EndpointPolicy_Export.h" \ // -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/FloatSeq.pidl b/TAO/tao/FloatSeq.pidl index 07ef18b5e7f..40b02b8f887 100644 --- a/TAO/tao/FloatSeq.pidl +++ b/TAO/tao/FloatSeq.pidl @@ -8,7 +8,7 @@ * * tao_idl * -oA AnyTypeCode - * -Ge 1 -GA -Sc -SS -Sci + * -Ge 1 -GA -SS -Sci * -Wb,pre_include=ace/pre.h * -Wb,post_include=ace/post.h * -Wb,export_macro=TAO_Export diff --git a/TAO/tao/IFR_Client/IFR_Base.pidl b/TAO/tao/IFR_Client/IFR_Base.pidl index 02ee7037d5f..754dadb1a90 100644 --- a/TAO/tao/IFR_Client/IFR_Base.pidl +++ b/TAO/tao/IFR_Client/IFR_Base.pidl @@ -14,7 +14,7 @@ * * The command used to generate code from this IDL file is: * - * tao_idl -Ge 1 -Sc -I../.. \ + * tao_idl -Ge 1 -GT -I../.. \ * -Wb,export_macro=TAO_IFR_Client_Export \ * -Wb,export_include=ifr_client_export.h \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/IFR_Client/IFR_Basic.pidl b/TAO/tao/IFR_Client/IFR_Basic.pidl index c86b4e3a291..82f7063c51f 100644 --- a/TAO/tao/IFR_Client/IFR_Basic.pidl +++ b/TAO/tao/IFR_Client/IFR_Basic.pidl @@ -13,7 +13,7 @@ * * The command used to generate code from this IDL file is: * - * tao_idl -Ge 1 -Sc -I../.. \ + * tao_idl -Ge 1 -GT -I../.. \ * -Wb,export_macro=TAO_IFR_Client_Export \ * -Wb,export_include=ifr_client_export.h \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/IFR_Client/IFR_Components.pidl b/TAO/tao/IFR_Client/IFR_Components.pidl index 7aa0102cd97..bad6a63dbf7 100644 --- a/TAO/tao/IFR_Client/IFR_Components.pidl +++ b/TAO/tao/IFR_Client/IFR_Components.pidl @@ -13,7 +13,7 @@ * * The command used to generate code from this IDL file is: * - * tao_idl -Ge 1 -Sc -I../.. \ + * tao_idl -Ge 1 -GT -I../.. \ * -Wb,export_macro=TAO_IFR_Client_Export \ * -Wb,export_include=ifr_client_export.h \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/IFR_Client/IFR_Extended.pidl b/TAO/tao/IFR_Client/IFR_Extended.pidl index 54675c6ef72..be97275f02e 100644 --- a/TAO/tao/IFR_Client/IFR_Extended.pidl +++ b/TAO/tao/IFR_Client/IFR_Extended.pidl @@ -13,7 +13,7 @@ * * The command used to generate code from this IDL file is: * - * tao_idl -Ge 1 -Sc -I../.. \ + * tao_idl -Ge 1 -GT -I../.. \ * -Wb,export_macro=TAO_IFR_Client_Export \ * -Wb,export_include=ifr_client_export.h \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/IIOP.pidl b/TAO/tao/IIOP.pidl index 3508d00b6cf..988a746534d 100644 --- a/TAO/tao/IIOP.pidl +++ b/TAO/tao/IIOP.pidl @@ -9,7 +9,7 @@ * is: * * tao_idl \ - * -o orig -Gp -Gd -Ge 1 -GA -Sc -Sci + * -o orig -Gp -Gd -Ge 1 -GA -Sci * -Wb,export_macro=TAO_Export \ * -Wb,export_include="tao/TAO_Export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/IIOP_Endpoints.pidl b/TAO/tao/IIOP_Endpoints.pidl index a0795123572..318ff28061c 100644 --- a/TAO/tao/IIOP_Endpoints.pidl +++ b/TAO/tao/IIOP_Endpoints.pidl @@ -23,7 +23,7 @@ // is: // // tao_idl -// -o orig -Ge 1 -GA -Sc -Sci \ +// -o orig -Ge 1 -GA -Sci \ // -Wb,export_macro=TAO_Export \ // -Wb,export_include="tao/TAO_Export.h" \ // -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/IOP_IOR.pidl b/TAO/tao/IOP_IOR.pidl index ab73e10ff0c..896ef455302 100644 --- a/TAO/tao/IOP_IOR.pidl +++ b/TAO/tao/IOP_IOR.pidl @@ -10,7 +10,7 @@ * command: * * tao_idl.exe - * -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci + * -o orig -Gp -Gd -Ge 1 -GA -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include=tao/TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/IORInterceptor/IORInfo.pidl b/TAO/tao/IORInterceptor/IORInfo.pidl index 4d192e058a7..86b21230a74 100644 --- a/TAO/tao/IORInterceptor/IORInfo.pidl +++ b/TAO/tao/IORInterceptor/IORInfo.pidl @@ -20,7 +20,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Gp -SS -Gd -Ge 1 -Sa -St -Sc -Sci + * -o orig -Gp -SS -Gd -Ge 1 -Sa -St -Sci * -I$(TAO_ROOT) * -Wb,export_macro=TAO_IORInterceptor_Export * -Wb,export_include="iorinterceptor_export.h" diff --git a/TAO/tao/IORInterceptor/IORInterceptor.pidl b/TAO/tao/IORInterceptor/IORInterceptor.pidl index 968fd662506..40568168fd8 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor.pidl +++ b/TAO/tao/IORInterceptor/IORInterceptor.pidl @@ -20,7 +20,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Gp -Gd -Ge 1 -Sa -Sc -St -Sci -SS + * -o orig -Gp -Gd -Ge 1 -Sa -St -Sci -SS * -I$(TAO_ROOT) * -Wb,export_macro=TAO_IORInterceptor_Export * -Wb,export_include="iorinterceptor_export.h" diff --git a/TAO/tao/IORManipulation/IOR.pidl b/TAO/tao/IORManipulation/IOR.pidl index b523f138ba9..20b010c8406 100644 --- a/TAO/tao/IORManipulation/IOR.pidl +++ b/TAO/tao/IORManipulation/IOR.pidl @@ -10,7 +10,7 @@ * To regenerate the code use: * * tao_idl \ - * -o orig -Gp -Gd -Ge 1 -Sc -GA -Sci \ + * -o orig -Gp -Gd -Ge 1 -GA -Sci \ * -Wb,export_macro=TAO_IORManip_Export \ * -Wb,export_include="ior_manip_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/ImR_Client/ImplRepo.pidl b/TAO/tao/ImR_Client/ImplRepo.pidl index e1eca929b2c..9806d3ada1e 100644 --- a/TAO/tao/ImR_Client/ImplRepo.pidl +++ b/TAO/tao/ImR_Client/ImplRepo.pidl @@ -10,7 +10,7 @@ * * The command used to generate code from this file is: * - * tao_idl -Ssi -Gp -Gd -Ge 1 -I$(TAO_ROOT) -Sc -Wb,export_macro=TAO_IMR_Client_Export -Wb,export_include=imr_client_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" ImplRepo.pidl + * tao_idl -Ssi -Gp -Gd -Ge 1 -I$(TAO_ROOT) -Wb,export_macro=TAO_IMR_Client_Export -Wb,export_include=imr_client_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" ImplRepo.pidl * */ //============================================================================= diff --git a/TAO/tao/ImR_Client/ServerObject.pidl b/TAO/tao/ImR_Client/ServerObject.pidl index ba18db9683c..f74d1be86a9 100644 --- a/TAO/tao/ImR_Client/ServerObject.pidl +++ b/TAO/tao/ImR_Client/ServerObject.pidl @@ -10,7 +10,7 @@ * * The command used to generate code from this file is: * - * tao_idl -Ssi -Gp -Gd -Ge 1 -Sc -I$(TAO_ROOT) -Wb,export_macro=TAO_IMR_Client_Export -Wb,export_include=imr_client_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" ServerObject.pidl + * tao_idl -Ssi -Gp -Gd -Ge 1 -I$(TAO_ROOT) -Wb,export_macro=TAO_IMR_Client_Export -Wb,export_include=imr_client_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" ServerObject.pidl * */ //============================================================================= diff --git a/TAO/tao/LongDoubleSeq.pidl b/TAO/tao/LongDoubleSeq.pidl index 0a25b452072..80594c356b1 100644 --- a/TAO/tao/LongDoubleSeq.pidl +++ b/TAO/tao/LongDoubleSeq.pidl @@ -8,7 +8,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Ge 1 -Sc -GA -SS -Sci + * -o orig -Ge 1 -GA -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/LongLongSeq.pidl b/TAO/tao/LongLongSeq.pidl index 3e25280acba..5cd57874ef9 100644 --- a/TAO/tao/LongLongSeq.pidl +++ b/TAO/tao/LongLongSeq.pidl @@ -8,7 +8,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Ge 1 -Sc -GA -SS -Sci + * -o orig -Ge 1 -GA -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/LongSeq.pidl b/TAO/tao/LongSeq.pidl index 5bff724288b..823f7790ab2 100644 --- a/TAO/tao/LongSeq.pidl +++ b/TAO/tao/LongSeq.pidl @@ -8,7 +8,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Ge 1 -Sc -GA -SS -Sci + * -o orig -Ge 1 -GA -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include=TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/Messaging/Messaging_No_Impl.pidl b/TAO/tao/Messaging/Messaging_No_Impl.pidl index d6fdaae0540..6f2320e0517 100644 --- a/TAO/tao/Messaging/Messaging_No_Impl.pidl +++ b/TAO/tao/Messaging/Messaging_No_Impl.pidl @@ -13,7 +13,7 @@ * The command used to generate code from this file is: * * tao_idl - * -o orig -Gp -Gd -Ge 1 -Sc -GA -Sci -SS + * -o orig -Gp -Gd -Ge 1 -GA -Sci -SS * -Wb,export_macro=TAO_Messaging_Export * -Wb,export_include=messaging_export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/Messaging/Messaging_RT_Policy.pidl b/TAO/tao/Messaging/Messaging_RT_Policy.pidl index dd2258a8546..130f6bb6d0b 100644 --- a/TAO/tao/Messaging/Messaging_RT_Policy.pidl +++ b/TAO/tao/Messaging/Messaging_RT_Policy.pidl @@ -12,7 +12,7 @@ * The command used to generate code from this file is: * * tao_idl - * -o orig -Gp -Gd -Ge 1 -Sc -GA -Sci -SS + * -o orig -Gp -Gd -Ge 1 -GA -Sci -SS * -Wb,export_macro=TAO_Messaging_Export * -Wb,export_include=messaging_export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl b/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl index ba99b43ab8b..bc2f4501514 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl +++ b/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl @@ -12,7 +12,7 @@ * The command used to generate code from this file is: * * tao_idl - * -o orig -Gp -Gd -Ge 1 -Sc -GA -Sci + * -o orig -Gp -Gd -Ge 1 -GA -Sci * -Wb,export_macro=TAO_Messaging_Export * -Wb,export_include=messaging_export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/Messaging/TAO_Ext.pidl b/TAO/tao/Messaging/TAO_Ext.pidl index 2836e129733..55eb98af6ec 100644 --- a/TAO/tao/Messaging/TAO_Ext.pidl +++ b/TAO/tao/Messaging/TAO_Ext.pidl @@ -15,7 +15,7 @@ * this is: * * tao_idl - * -o orig -Gp -Gd -Ge 1 -Sc -GA -Sci -SS + * -o orig -Gp -Gd -Ge 1 -GA -Sci -SS * -Wb,export_macro=TAO_Messaging_Export * -Wb,export_include=messaging_export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/Messaging_PolicyValue.pidl b/TAO/tao/Messaging_PolicyValue.pidl index 7775f89e4d1..e52ea2a59e2 100644 --- a/TAO/tao/Messaging_PolicyValue.pidl +++ b/TAO/tao/Messaging_PolicyValue.pidl @@ -10,7 +10,7 @@ * * tao_idl * -oA AnyTypeCode - * -Ge 1 -GA -Sc -SS -Sci + * -Ge 1 -GA -SS -Sci * -Wb,pre_include=ace/pre.h * -Wb,post_include=ace/post.h * -Wb,export_macro=TAO_Export diff --git a/TAO/tao/Messaging_SyncScope.pidl b/TAO/tao/Messaging_SyncScope.pidl index cbc536b4c42..af498458ab4 100644 --- a/TAO/tao/Messaging_SyncScope.pidl +++ b/TAO/tao/Messaging_SyncScope.pidl @@ -9,7 +9,7 @@ * The command used to generate code from this file is: * * tao_idl.exe - * -o orig -St -Sc -Sci + * -o orig -St -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include=tao/TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/ObjRefTemplate/Default_ORT.pidl b/TAO/tao/ObjRefTemplate/Default_ORT.pidl index 9ef0be12442..31b9596fe9e 100644 --- a/TAO/tao/ObjRefTemplate/Default_ORT.pidl +++ b/TAO/tao/ObjRefTemplate/Default_ORT.pidl @@ -10,7 +10,7 @@ * command: * * tao_idl.exe - * -o orig -Ge 1 -Sc -GA + * -o orig -Ge 1 -GA * -I../.. * -Wb,export_macro=TAO_ORT_Export \ * -Wb,export_include="ort_export.h" \ diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl index f26d45984bc..8ec779c75cf 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl @@ -11,7 +11,7 @@ * using the following command: * * tao_idl.exe - * -o orig -Gp -Gd -Ge 1 -Sc -GA + * -o orig -Gp -Gd -Ge 1 -GA * -I$(TAO_ROOT) * -Wb,export_macro=TAO_ORT_Export * -Wb,export_include=ort_export.h diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_include.pidl b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_include.pidl index 5335679ca76..9e937f9251c 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_include.pidl +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_include.pidl @@ -15,7 +15,7 @@ * 1. Run the tao_idl compiler on the pidl file. The command used for * this is: * - * tao_idl -o orig -St -Sc -Sp + * tao_idl -o orig -St -Sp * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" * ObjectReferenceTemplate_include.pidl diff --git a/TAO/tao/Object_Key.pidl b/TAO/tao/Object_Key.pidl index 31e914a6505..ef451a7c595 100644 --- a/TAO/tao/Object_Key.pidl +++ b/TAO/tao/Object_Key.pidl @@ -6,7 +6,7 @@ // The command used to generate code is: // // tao_idl -// -o orig -Ge 1 -St -Gp -Gd -Sc -Sci +// -o orig -Ge 1 -St -Gp -Gd -Sci // -Wb,export_macro=TAO_Export // -Wb,export_macro="tao/TAO_Export" // -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/OctetSeq.pidl b/TAO/tao/OctetSeq.pidl index e0d27947f2a..2c59a050eb2 100644 --- a/TAO/tao/OctetSeq.pidl +++ b/TAO/tao/OctetSeq.pidl @@ -9,7 +9,7 @@ * * tao_idl * -oA AnyTypeCode - * -Ge 1 -GA -Sc -SS -Sci + * -Ge 1 -GA -SS -Sci * -Wb,pre_include=ace/pre.h * -Wb,post_include=ace/post.h * -Wb,export_macro=TAO_Export diff --git a/TAO/tao/PI/ClientRequestInfo.pidl b/TAO/tao/PI/ClientRequestInfo.pidl index 1a5baca1d14..f649b1d130b 100644 --- a/TAO/tao/PI/ClientRequestInfo.pidl +++ b/TAO/tao/PI/ClientRequestInfo.pidl @@ -11,7 +11,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci + * -o orig -Gp -Gd -Ge 1 -GA -SS -Sci * -Wb,export_include="tao/TAO_Export.h" * -Wb,export_macro=TAO_Export * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/PI/ClientRequestInterceptor.pidl b/TAO/tao/PI/ClientRequestInterceptor.pidl index 11a07bab4a8..e45311359d9 100644 --- a/TAO/tao/PI/ClientRequestInterceptor.pidl +++ b/TAO/tao/PI/ClientRequestInterceptor.pidl @@ -17,7 +17,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci + * -o orig -Gp -Gd -Ge 1 -GA -SS -Sci * -Wb,export_include="tao/PI_Client/pi_client_export.h.h" * -Wb,export_macro=TAO_PI_CLIENT_Export * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/PI/Interceptor.pidl b/TAO/tao/PI/Interceptor.pidl index f2a028db841..ed9ec855a56 100644 --- a/TAO/tao/PI/Interceptor.pidl +++ b/TAO/tao/PI/Interceptor.pidl @@ -12,7 +12,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci + * -o orig -Gp -Gd -Ge 1 -GA -SS -Sci * -Wb,export_include="tao/TAO_Export.h" * -Wb,export_macro=TAO_Export * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/PI/InvalidSlot.pidl b/TAO/tao/PI/InvalidSlot.pidl index bd82c726aa5..bc5b26c72a9 100644 --- a/TAO/tao/PI/InvalidSlot.pidl +++ b/TAO/tao/PI/InvalidSlot.pidl @@ -11,7 +11,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci + * -o orig -Gp -Gd -Ge 1 -GA -SS -Sci * -Wb,export_include="tao/TAO_Export.h" * -Wb,export_macro=TAO_Export * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/PI/ORBInitInfo.pidl b/TAO/tao/PI/ORBInitInfo.pidl index 052b05c0372..780d6783da7 100644 --- a/TAO/tao/PI/ORBInitInfo.pidl +++ b/TAO/tao/PI/ORBInitInfo.pidl @@ -11,7 +11,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Gp -Gd -Ge 1 -Sc -SS -Sci + * -o orig -Gp -Gd -Ge 1 -SS -Sci * -Wb,export_include="tao/TAO_Export.h" * -Wb,export_macro=TAO_Export * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/PI/ORBInitializer.pidl b/TAO/tao/PI/ORBInitializer.pidl index aad972f58da..9c6cee85180 100644 --- a/TAO/tao/PI/ORBInitializer.pidl +++ b/TAO/tao/PI/ORBInitializer.pidl @@ -12,7 +12,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci + * -o orig -Gp -Gd -Ge 1 -GA -SS -Sci * -Wb,export_include="tao/PI_Client/pi_client_export.h.h" * -Wb,export_macro=TAO_PI_CLIENT_Export * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/PI/PICurrent.pidl b/TAO/tao/PI/PICurrent.pidl index 0ce4b8a7014..3cfc5cfb8cb 100644 --- a/TAO/tao/PI/PICurrent.pidl +++ b/TAO/tao/PI/PICurrent.pidl @@ -9,7 +9,7 @@ * components in the ORB. * * tao_idl - * -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci + * -o orig -Gp -Gd -Ge 1 -GA -SS -Sci * -Wb,export_include="tao/TAO_Export.h" * -Wb,export_macro=TAO_Export * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/PI/PIForwardRequest.pidl b/TAO/tao/PI/PIForwardRequest.pidl index 8b2d6fd1ec9..d30720eb633 100644 --- a/TAO/tao/PI/PIForwardRequest.pidl +++ b/TAO/tao/PI/PIForwardRequest.pidl @@ -12,7 +12,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci + * -o orig -Gp -Gd -Ge 1 -GA -SS -Sci * -Wb,export_include="tao/TAO_Export.h" * -Wb,export_macro=TAO_Export * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/PI/PolicyFactory.pidl b/TAO/tao/PI/PolicyFactory.pidl index f2ee6020c5a..761eea60052 100644 --- a/TAO/tao/PI/PolicyFactory.pidl +++ b/TAO/tao/PI/PolicyFactory.pidl @@ -8,7 +8,7 @@ * @brief Pre-compiled IDL source for the PolicyFactory * * tao_idl - * -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci + * -o orig -Gp -Gd -Ge 1 -GA -SS -Sci * -Wb,export_include="tao/TAO_Export.h" * -Wb,export_macro=TAO_Export * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/PI/ProcessingModePolicy.pidl b/TAO/tao/PI/ProcessingModePolicy.pidl index 4b8a6bac91e..aa1f2d9b71e 100644 --- a/TAO/tao/PI/ProcessingModePolicy.pidl +++ b/TAO/tao/PI/ProcessingModePolicy.pidl @@ -7,7 +7,7 @@ * the PortableInterceptor module. * * tao_idl \ - * -o orig -Gp -Gd -Ge 1 -GT -Sc -GA \ + * -o orig -Gp -Gd -Ge 1 -GT -GA \ * -Wb,export_include="tao/TAO_Export.h" \ * -Wb,export_macro=TAO_Export \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PI/RequestInfo.pidl b/TAO/tao/PI/RequestInfo.pidl index 42830e28672..b26d17b1ca5 100644 --- a/TAO/tao/PI/RequestInfo.pidl +++ b/TAO/tao/PI/RequestInfo.pidl @@ -11,7 +11,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci + * -o orig -Gp -Gd -Ge 1 -GA -SS -Sci * -Wb,export_include="tao/TAO_Export.h" * -Wb,export_macro=TAO_Export * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/PI_Forward.pidl b/TAO/tao/PI_Forward.pidl index 4ace2af6e7b..556d23a7a4c 100644 --- a/TAO/tao/PI_Forward.pidl +++ b/TAO/tao/PI_Forward.pidl @@ -12,7 +12,7 @@ * using the following command: * * tao_idl.exe - * -o orig -Gp -Gd -Ge 1 -Sc -Sci + * -o orig -Gp -Gd -Ge 1 -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include=tao/TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/PI_Server/ServerRequestInfo.pidl b/TAO/tao/PI_Server/ServerRequestInfo.pidl index d8a4c52639d..9679b29c2e8 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.pidl +++ b/TAO/tao/PI_Server/ServerRequestInfo.pidl @@ -11,7 +11,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci + * -o orig -Gp -Gd -Ge 1 -GA -SS -Sci * -Wb,export_include="tao/TAO_Export.h" * -Wb,export_macro=TAO_Export * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/PI_Server/ServerRequestInterceptor.pidl b/TAO/tao/PI_Server/ServerRequestInterceptor.pidl index 571b35e9c73..40d2e9d53e2 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptor.pidl +++ b/TAO/tao/PI_Server/ServerRequestInterceptor.pidl @@ -12,7 +12,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci + * -o orig -Gp -Gd -Ge 1 -GA -SS -Sci * -Wb,export_include="tao/PI_Server/pi_server_export.h" * -Wb,export_macro=TAO_PI_Server_Export * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/ParameterMode.pidl b/TAO/tao/ParameterMode.pidl index 5cd0b8a36c4..2fb02fa70f4 100644 --- a/TAO/tao/ParameterMode.pidl +++ b/TAO/tao/ParameterMode.pidl @@ -10,7 +10,7 @@ * used to generate code is: * * tao_idl - * -o orig -Ge 1 -GA -Sc -SS -Sci + * -o orig -Ge 1 -GA -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/Policy_Forward.pidl b/TAO/tao/Policy_Forward.pidl index d29bdb445c6..abe7a0f954e 100644 --- a/TAO/tao/Policy_Forward.pidl +++ b/TAO/tao/Policy_Forward.pidl @@ -17,7 +17,7 @@ * command used for this is: * * tao_idl.exe - * -o orig -Ge 1 -GA -Sc -SS -Sci + * -o orig -Ge 1 -GA -SS -Sci * -Wb,export_macro="tao/TAO_Export" * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" diff --git a/TAO/tao/PortableInterceptor.pidl b/TAO/tao/PortableInterceptor.pidl index fdf42e809ae..cec2a5046f1 100644 --- a/TAO/tao/PortableInterceptor.pidl +++ b/TAO/tao/PortableInterceptor.pidl @@ -22,7 +22,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Gp -Gd -Ge 1 -Sc -SS -Sci + * -o orig -Gp -Gd -Ge 1 -SS -Sci * -Wb,export_include="tao/TAO_Export.h" * -Wb,export_macro=TAO_Export * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/PortableServer/AdapterActivator.pidl b/TAO/tao/PortableServer/AdapterActivator.pidl index 81adf4c3039..23abf69720d 100644 --- a/TAO/tao/PortableServer/AdapterActivator.pidl +++ b/TAO/tao/PortableServer/AdapterActivator.pidl @@ -9,7 +9,7 @@ * AdapaterActivatorC.{h,inl,cpp}, using the following command: * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -Sc -GA -Sci -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -GA -Sci -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/ForwardRequest.pidl b/TAO/tao/PortableServer/ForwardRequest.pidl index c8df7d7d6a3..93737add656 100644 --- a/TAO/tao/PortableServer/ForwardRequest.pidl +++ b/TAO/tao/PortableServer/ForwardRequest.pidl @@ -9,7 +9,7 @@ * ForwardRequestC.{h,inl,cpp}, using the following command: * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.pidl b/TAO/tao/PortableServer/IdAssignmentPolicy.pidl index 7f06e39e614..123adc4e558 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicy.pidl +++ b/TAO/tao/PortableServer/IdAssignmentPolicy.pidl @@ -6,7 +6,7 @@ * @brief Pre-compiled IDL source for the PortableServer module. * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -Sci -Sc -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.pidl b/TAO/tao/PortableServer/IdUniquenessPolicy.pidl index 5175cb16d30..4937117fa78 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicy.pidl +++ b/TAO/tao/PortableServer/IdUniquenessPolicy.pidl @@ -6,7 +6,7 @@ * @brief Pre-compiled IDL source for the PortableServer module. * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl b/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl index 976c399bc02..4c0f9715a4b 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl +++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl @@ -6,7 +6,7 @@ * @brief Pre-compiled IDL source for the PortableServer module. * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/LifespanPolicy.pidl b/TAO/tao/PortableServer/LifespanPolicy.pidl index 6ab38f36c71..db8e6eb0499 100644 --- a/TAO/tao/PortableServer/LifespanPolicy.pidl +++ b/TAO/tao/PortableServer/LifespanPolicy.pidl @@ -6,7 +6,7 @@ * @brief Pre-compiled IDL source for the PortableServer module. * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -Sc -GA -Sci -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -GA -Sci -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/POAManager.pidl b/TAO/tao/PortableServer/POAManager.pidl index c678575ac30..b7e6bf7f7b9 100644 --- a/TAO/tao/PortableServer/POAManager.pidl +++ b/TAO/tao/PortableServer/POAManager.pidl @@ -6,7 +6,7 @@ * @brief Pre-compiled IDL source for the PortableServer module. * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/POAManagerFactory.pidl b/TAO/tao/PortableServer/POAManagerFactory.pidl index 562190c8685..5ecac5118a9 100644 --- a/TAO/tao/PortableServer/POAManagerFactory.pidl +++ b/TAO/tao/PortableServer/POAManagerFactory.pidl @@ -6,7 +6,7 @@ * @brief Pre-compiled IDL source for the PortableServer module. * $ACE_ROOT/bin/tao_idl \ - -Gp -Gd -Ge 1 -Sc -Sci -I$TAO_ROOT \ + -Gp -Gd -Ge 1 -Sci -I$TAO_ROOT \ -Wb,export_macro=TAO_PortableServer_Export \ -Wb,export_include="tao/PortableServer/portableserver_export.h" \ -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/PS_Current.pidl b/TAO/tao/PortableServer/PS_Current.pidl index 91bd07204c6..d9c8f9b8227 100644 --- a/TAO/tao/PortableServer/PS_Current.pidl +++ b/TAO/tao/PortableServer/PS_Current.pidl @@ -9,7 +9,7 @@ * PS_CurrentC.{h,inl,cpp}, using the following command: * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -Sci -Sc -SS -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -Sci -SS -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/PS_Forward.pidl b/TAO/tao/PortableServer/PS_Forward.pidl index f475927eab9..408fd7360ad 100644 --- a/TAO/tao/PortableServer/PS_Forward.pidl +++ b/TAO/tao/PortableServer/PS_Forward.pidl @@ -9,7 +9,7 @@ * PS_ForwardC.{h,inl,cpp}, using the following command: * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/PortableServer.pidl b/TAO/tao/PortableServer/PortableServer.pidl index 50000e9bcb8..2314b6f5630 100644 --- a/TAO/tao/PortableServer/PortableServer.pidl +++ b/TAO/tao/PortableServer/PortableServer.pidl @@ -9,7 +9,7 @@ * PortableServerC.{h,inl,cpp}, using the following command: * * tao_idl.exe \ - * -o orig -Sci -Gp -Gd -Ge 1 -Sc -GA -I$(TAO_ROOT) + * -o orig -Sci -Gp -Gd -Ge 1 -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ @@ -79,7 +79,7 @@ module PortableServer // Forward declaration POAManagerFactory interface. local interface POAManagerFactory; - + // Forward declaration AdapterActivator interface. local interface AdapterActivator; diff --git a/TAO/tao/PortableServer/PortableServer_include.pidl b/TAO/tao/PortableServer/PortableServer_include.pidl index 54132cd083d..95d7690fc8d 100644 --- a/TAO/tao/PortableServer/PortableServer_include.pidl +++ b/TAO/tao/PortableServer/PortableServer_include.pidl @@ -15,7 +15,7 @@ * 1. Run the tao_idl compiler on the pidl file. The command used for * this is: * - * tao_idl -o orig -St -Sc -Sp -Sci -SS + * tao_idl -o orig -St -Sp -Sci -SS * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.pidl b/TAO/tao/PortableServer/RequestProcessingPolicy.pidl index 256defab1b9..acb38c7b3e7 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicy.pidl +++ b/TAO/tao/PortableServer/RequestProcessingPolicy.pidl @@ -6,7 +6,7 @@ * @brief Pre-compiled IDL source for the PortableServer module. * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/ServantActivator.pidl b/TAO/tao/PortableServer/ServantActivator.pidl index f84cffaa3b1..b517fa5ed42 100644 --- a/TAO/tao/PortableServer/ServantActivator.pidl +++ b/TAO/tao/PortableServer/ServantActivator.pidl @@ -9,7 +9,7 @@ * ServantActivatorC.{h,inl,cpp}, using the following command: * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/ServantLocator.pidl b/TAO/tao/PortableServer/ServantLocator.pidl index 69b5961bafe..39265e20d6f 100644 --- a/TAO/tao/PortableServer/ServantLocator.pidl +++ b/TAO/tao/PortableServer/ServantLocator.pidl @@ -9,7 +9,7 @@ * ServantLocatorC.{h,inl,cpp}, using the following command: * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/ServantManager.pidl b/TAO/tao/PortableServer/ServantManager.pidl index dd2495559e0..ad9d020b8ff 100644 --- a/TAO/tao/PortableServer/ServantManager.pidl +++ b/TAO/tao/PortableServer/ServantManager.pidl @@ -9,7 +9,7 @@ * ServantManagerC.{h,inl,cpp}, using the following command: * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.pidl b/TAO/tao/PortableServer/ServantRetentionPolicy.pidl index 6301a5be4ca..641e81f6ffd 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicy.pidl +++ b/TAO/tao/PortableServer/ServantRetentionPolicy.pidl @@ -6,7 +6,7 @@ * @brief Pre-compiled IDL source for the PortableServer module. * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/ThreadPolicy.pidl b/TAO/tao/PortableServer/ThreadPolicy.pidl index 9f37950dfb4..67f4c9ee964 100644 --- a/TAO/tao/PortableServer/ThreadPolicy.pidl +++ b/TAO/tao/PortableServer/ThreadPolicy.pidl @@ -6,7 +6,7 @@ * @brief Pre-compiled IDL source for the PortableServer module. * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/RTCORBA/RTCORBA_include.pidl b/TAO/tao/RTCORBA/RTCORBA_include.pidl index 206fc6d2c8c..a728652a44e 100644 --- a/TAO/tao/RTCORBA/RTCORBA_include.pidl +++ b/TAO/tao/RTCORBA/RTCORBA_include.pidl @@ -6,8 +6,8 @@ * @brief Include file for use in applications that need RTCORBA.pidl. * * This file just includes RTCORBA.pidl. The *C.h file generated from - * this is hand-crafted to itself include RTCORBA.h instead of - * RTCORBAC.h (which will produce a compiler error message if + * this is hand-crafted to itself include RTCORBA.h instead of + * RTCORBAC.h (which will produce a compiler error message if * included directly). The RTCORBA_includeC.h file can then be * included directly and automatically by the IDL compiler when * building the application. @@ -15,7 +15,7 @@ * 1. Run the tao_idl compiler on the pidl file. The command used for * this is: * - * tao_idl -o orig -St -Sc -Sp + * tao_idl -o orig -St -Sp * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" * RTCORBA_include.pidl diff --git a/TAO/tao/RTPortableServer/RTPortableServer.pidl b/TAO/tao/RTPortableServer/RTPortableServer.pidl index cd06ae858ab..24d24cd5302 100644 --- a/TAO/tao/RTPortableServer/RTPortableServer.pidl +++ b/TAO/tao/RTPortableServer/RTPortableServer.pidl @@ -12,7 +12,7 @@ * this is: * * tao_idl - * -o orig -Ge 1 -GA -Sc -Sci + * -o orig -Ge 1 -GA -Sci * -Wb,export_macro=TAO_RTPortableServer_Export * -Wb,export_include="rtportableserver_export.h" * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/RTPortableServer/RTPortableServer_include.pidl b/TAO/tao/RTPortableServer/RTPortableServer_include.pidl index 1d5a8883c79..0a16df733bd 100644 --- a/TAO/tao/RTPortableServer/RTPortableServer_include.pidl +++ b/TAO/tao/RTPortableServer/RTPortableServer_include.pidl @@ -15,7 +15,7 @@ * 1. Run the tao_idl compiler on the pidl file. The command used for * this is: * - * tao_idl -o orig -St -Sc -Sp -Sci -SS + * tao_idl -o orig -St -Sp -Sci -SS * -Wb,export_macro=TAO_RTPortableServer_Export \ * -Wb,export_include="rtportableserver_export.h" \ * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/RTScheduling/RTScheduler_include.pidl b/TAO/tao/RTScheduling/RTScheduler_include.pidl index 0c743c6794e..4ab39b3131a 100644 --- a/TAO/tao/RTScheduling/RTScheduler_include.pidl +++ b/TAO/tao/RTScheduling/RTScheduler_include.pidl @@ -15,7 +15,7 @@ * 1. Run the tao_idl compiler on the pidl file. The command used for * this is: * - * tao_idl -o orig -St -Sc -Sp + * tao_idl -o orig -St -Sp * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" * RTScheduler_include.pidl diff --git a/TAO/tao/ShortSeq.pidl b/TAO/tao/ShortSeq.pidl index 3dd8dea9f61..cef83a5f810 100644 --- a/TAO/tao/ShortSeq.pidl +++ b/TAO/tao/ShortSeq.pidl @@ -8,7 +8,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Ge 1 -Sc -GA -SS -Sci + * -o orig -Ge 1 -GA -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" diff --git a/TAO/tao/Strategies/sciop_endpoints.pidl b/TAO/tao/Strategies/sciop_endpoints.pidl index 42050da0264..20088796da9 100644 --- a/TAO/tao/Strategies/sciop_endpoints.pidl +++ b/TAO/tao/Strategies/sciop_endpoints.pidl @@ -23,7 +23,7 @@ // is: // // tao_idl -// -o orig -Gp -Gd -Ge 1 -Sc -Sa -DCORBA3 -Sci +// -o orig -Gp -Gd -Ge 1 -Sa -DCORBA3 -Sci // -Wb,export_macro=TAO_Strategies_Export \ // -Wb,export_include="strategies_export.h" \ // -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/Strategies/uiop_endpoints.pidl b/TAO/tao/Strategies/uiop_endpoints.pidl index 47856ae4ea4..70f3c3c5214 100644 --- a/TAO/tao/Strategies/uiop_endpoints.pidl +++ b/TAO/tao/Strategies/uiop_endpoints.pidl @@ -21,7 +21,7 @@ // is: // // tao_idl -// -o orig -Gp -Gd -Ge 1 -Sc -Sa -DCORBA3 -Sci +// -o orig -Gp -Gd -Ge 1 -Sa -DCORBA3 -Sci // -Wb,export_macro=TAO_Strategies_Export \ // -Wb,export_include="strategies_export.h" \ // -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/StringSeq.pidl b/TAO/tao/StringSeq.pidl index 570abbec04c..7140ff2ac44 100644 --- a/TAO/tao/StringSeq.pidl +++ b/TAO/tao/StringSeq.pidl @@ -8,7 +8,7 @@ // The command used to generate code is: // // tao_idl -// -o orig -Ge 1 -GA -Sc -SS -Sci +// -o orig -Ge 1 -GA -SS -Sci // -Wb,export_macro=TAO_Export // -Wb,pre_include="ace/pre.h" // -Wb,post_include="ace/post.h" diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl b/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl index 5e393fa8a56..40521cc0d60 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl @@ -28,7 +28,7 @@ // 2. Generate the code. The command used to generate code from this // IDL file is: // -// tao_idl -o orig -Sc -Ge 1 -I../.. -Sci \ +// tao_idl -o orig -Ge 1 -I../.. -Sci \ // -Wb,export_macro=TAO_TypeCodeFactory_Export \ // -Wb,export_include=typecodefactory_export.h \ // -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/ULongLongSeq.pidl b/TAO/tao/ULongLongSeq.pidl index 352ffd94254..319ecb57382 100644 --- a/TAO/tao/ULongLongSeq.pidl +++ b/TAO/tao/ULongLongSeq.pidl @@ -8,7 +8,7 @@ * * tao_idl * -oA AnyTypeCode - * -Ge 1 -GA -Sc -SS -Sci + * -Ge 1 -GA -SS -Sci * -Wb,pre_include=ace/pre.h * -Wb,post_include=ace/post.h * -Wb,export_macro=TAO_Export diff --git a/TAO/tao/ULongSeq.pidl b/TAO/tao/ULongSeq.pidl index a9bf1f63c98..1c026ceb332 100644 --- a/TAO/tao/ULongSeq.pidl +++ b/TAO/tao/ULongSeq.pidl @@ -9,7 +9,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Ge 1 -Sc -GA -SS -Sci + * -o orig -Ge 1 -GA -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include=tao/TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/UShortSeq.pidl b/TAO/tao/UShortSeq.pidl index 14e88891383..9a6e6bd9667 100644 --- a/TAO/tao/UShortSeq.pidl +++ b/TAO/tao/UShortSeq.pidl @@ -8,7 +8,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Ge 1 -Sc -GA -SS -Sci + * -o orig -Ge 1 -GA -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include=tao/TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/WCharSeq.pidl b/TAO/tao/WCharSeq.pidl index 6026f1c8b87..d10333981c1 100644 --- a/TAO/tao/WCharSeq.pidl +++ b/TAO/tao/WCharSeq.pidl @@ -8,7 +8,7 @@ * * tao_idl * -oA AnyTypeCode - * -Ge 1 -GA -Sc -SS -Sci + * -Ge 1 -GA -SS -Sci * -Wb,pre_include=ace/pre.h * -Wb,post_include=ace/post.h * -Wb,export_macro=TAO_Export diff --git a/TAO/tao/WStringSeq.pidl b/TAO/tao/WStringSeq.pidl index 96e9f5360ad..392d7e9854e 100644 --- a/TAO/tao/WStringSeq.pidl +++ b/TAO/tao/WStringSeq.pidl @@ -8,7 +8,7 @@ * * tao_idl * -oA AnyTypeCode - * -Ge 1 -GA -Sc -SS -Sci + * -Ge 1 -GA -SS -Sci * -Wb,pre_include=ace/pre.h * -Wb,post_include=ace/post.h * -Wb,export_macro=TAO_Export diff --git a/TAO/tao/WrongTransaction.pidl b/TAO/tao/WrongTransaction.pidl index c9fcde86f38..6fa5bf56a6d 100644 --- a/TAO/tao/WrongTransaction.pidl +++ b/TAO/tao/WrongTransaction.pidl @@ -10,7 +10,7 @@ * following command: * * tao_idl - * -o orig -Ge 1 -GA -Sc -Sci -SS + * -o orig -Ge 1 -GA -Sci -SS * -Wb,export_macro=TAO_Export * -Wb,export_include=tao/TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/orb_types.pidl b/TAO/tao/orb_types.pidl index d8c0f4fd804..d879b3bd40a 100644 --- a/TAO/tao/orb_types.pidl +++ b/TAO/tao/orb_types.pidl @@ -10,7 +10,7 @@ * used to generate code is: * * tao_idl - * -o orig -SS -Ge 1 -Sc -Sci + * -o orig -SS -Ge 1 -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" diff --git a/ace/CDR_Stream.cpp b/ace/CDR_Stream.cpp index afc43abc05b..5f624475e57 100644 --- a/ace/CDR_Stream.cpp +++ b/ace/CDR_Stream.cpp @@ -51,7 +51,8 @@ ACE_OutputCDR::ACE_OutputCDR (size_t size, this->current_ = &this->start_; } -ACE_OutputCDR::ACE_OutputCDR (char *data, size_t size, +ACE_OutputCDR::ACE_OutputCDR (char *data, + size_t size, int byte_order, ACE_Allocator *buffer_allocator, ACE_Allocator *data_block_allocator, diff --git a/ace/Condition_T.cpp b/ace/Condition_T.cpp index c2d4375486e..df125ee0816 100644 --- a/ace/Condition_T.cpp +++ b/ace/Condition_T.cpp @@ -28,11 +28,6 @@ ACE_Condition<MUTEX>::dump (void) const // ACE_TRACE ("ACE_Condition<MUTEX>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); -#if defined (CHORUS) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("condname_ = %s\n"), this->condname_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("process_cond_ = %x\n"), - this->process_cond_)); -#endif /* CHORUS */ ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ @@ -63,68 +58,8 @@ ACE_Condition<MUTEX>::ACE_Condition (MUTEX &m, const ACE_TCHAR *name, void *arg) : -#if defined (CHORUS) - process_cond_(0), - condname_ (0), -#endif /* CHORUS */ mutex_ (m) { - -#if defined(CHORUS) - if (type == USYNC_PROCESS) - { - // Let's see if the shared memory entity already exists. - ACE_HANDLE fd = ACE_OS::shm_open (name, - O_RDWR | O_CREAT | O_EXCL, - ACE_DEFAULT_FILE_PERMS); - if (fd == ACE_INVALID_HANDLE) - { - if (errno == EEXIST) - fd = ACE_OS::shm_open (name, - O_RDWR | O_CREAT, - ACE_DEFAULT_FILE_PERMS); - else - return; - } - else - { - // We own this shared memory object! Let's set its size. - if (ACE_OS::ftruncate (fd, - sizeof (ACE_mutex_t)) == -1) - { - ACE_OS::close (fd); - return; - } - this->condname_ = ACE_OS::strdup (name); - if (this->condname_ == 0) - { - ACE_OS::close (fd); - return; - } - } - - this->process_cond_ = - (ACE_cond_t *) ACE_OS::mmap (0, - sizeof (ACE_cond_t), - PROT_RDWR, - MAP_SHARED, - fd, - 0); - ACE_OS::close (fd); - if (this->process_cond_ == MAP_FAILED) - return; - - if (this->condname_ - && ACE_OS::cond_init (this->process_cond_, - type, - name, - arg) != 0) - return; - } - // It is ok to fall through into the <cond_init> below if the - // USYNC_PROCESS flag is not enabled. -#endif /* CHORUS */ - // ACE_TRACE ("ACE_Condition<MUTEX>::ACE_Condition"); if (ACE_OS::cond_init (&this->cond_, @@ -151,11 +86,6 @@ template <class MUTEX> int ACE_Condition<MUTEX>::wait (void) { // ACE_TRACE ("ACE_Condition<MUTEX>::wait"); -#if defined (CHORUS) - if (this->process_cond_ != 0) - return ACE_OS::cond_wait (this->process_cond_, - &this->mutex_.lock_); -#endif /* CHORUS */ return ACE_OS::cond_wait (&this->cond_, &this->mutex_.lock_); } @@ -169,12 +99,6 @@ ACE_Condition<MUTEX>::wait (MUTEX &mutex, return this->wait (); else { -#if defined (CHORUS) - if (this->process_cond_ != 0) - return ACE_OS::cond_timedwait (this->process_cond_, - &mutex_.lock_, - (ACE_Time_Value *) abstime); -#endif /* CHORUS */ return ACE_OS::cond_timedwait (&this->cond_, &mutex.lock_, (ACE_Time_Value *) abstime); diff --git a/ace/Condition_T.h b/ace/Condition_T.h index e5ec5fcaab7..535642a77e8 100644 --- a/ace/Condition_T.h +++ b/ace/Condition_T.h @@ -104,18 +104,6 @@ public: // Declare the dynamic allocation hooks. protected: -#if defined (CHORUS) - /// This condition resides in shared memory. - ACE_cond_t *process_cond_; - - /** - * Remember the name of the condition if we created it so we can - * unlink it when we go away (only the actor that initialized the - * memory can destroy it). - */ - const ACE_TCHAR *condname_; -#endif /* CHORUS */ - /// Condition variable. ACE_cond_t cond_; diff --git a/ace/Condition_T.inl b/ace/Condition_T.inl index b787569a764..fd7bdb7abdc 100644 --- a/ace/Condition_T.inl +++ b/ace/Condition_T.inl @@ -17,39 +17,12 @@ ACE_Condition<MUTEX>::remove (void) int result = 0; -#if defined (CHORUS) - // Are we the owner? - if (this->process_cond_ && this->condname_) + while ((result = ACE_OS::cond_destroy (&this->cond_)) == -1 + && errno == EBUSY) { - // Only destroy the condition if we're the ones who initialized - // it. - while ((result = ACE_OS::cond_destroy (this->process_cond_)) == -1 - && errno == EBUSY) - { - ACE_OS::cond_broadcast (this->process_cond_); - ACE_OS::thr_yield (); - } - ACE_OS::munmap (this->process_cond_, - sizeof (ACE_cond_t)); - ACE_OS::shm_unlink (this->condname_); - ACE_OS::free ( - static_cast<void *> (const_cast<ACE_TCHAR *> (this->condname_))); + ACE_OS::cond_broadcast (&this->cond_); + ACE_OS::thr_yield (); } - else if (this->process_cond_) - { - ACE_OS::munmap (this->process_cond_, - sizeof (ACE_cond_t)); - result = 0; - } - else -#endif /* CHORUS */ - - while ((result = ACE_OS::cond_destroy (&this->cond_)) == -1 - && errno == EBUSY) - { - ACE_OS::cond_broadcast (&this->cond_); - ACE_OS::thr_yield (); - } return result; } @@ -65,10 +38,6 @@ template <class MUTEX> ACE_INLINE int ACE_Condition<MUTEX>::signal (void) { // ACE_TRACE ("ACE_Condition<MUTEX>::signal"); -#if defined (CHORUS) - if (this->process_cond_ != 0) - return ACE_OS::cond_signal (this->process_cond_); -#endif /* CHORUS */ return ACE_OS::cond_signal (&this->cond_); } @@ -76,10 +45,6 @@ template <class MUTEX> ACE_INLINE int ACE_Condition<MUTEX>::broadcast (void) { // ACE_TRACE ("ACE_Condition<MUTEX>::broadcast"); -#if defined (CHORUS) - if (this->process_cond_ != 0) - return ACE_OS::cond_broadcast (this->process_cond_); -#endif /* CHORUS */ return ACE_OS::cond_broadcast (&this->cond_); } diff --git a/ace/Configuration.cpp b/ace/Configuration.cpp index 6cfec441cf6..cdbd176d301 100644 --- a/ace/Configuration.cpp +++ b/ace/Configuration.cpp @@ -1324,15 +1324,7 @@ ACE_Configuration_Heap::open (const ACE_TCHAR* file_name, return -1; } -#if !defined (CHORUS) ACE_MMAP_Memory_Pool::OPTIONS options (base_address); -#else - // Use base address == 0, don't use a fixed address. - ACE_MMAP_Memory_Pool::OPTIONS options (0, - 0, - 0, - ACE_CHORUS_LOCAL_NAME_SPACE_T_SIZE); -#endif /* CHORUS */ // Create the allocator with the appropriate options. The name used // for the lock is the same as one used for the file. diff --git a/ace/Event_Handler.cpp b/ace/Event_Handler.cpp index c0daee5bdba..351cb3309df 100644 --- a/ace/Event_Handler.cpp +++ b/ace/Event_Handler.cpp @@ -273,7 +273,7 @@ ACE_Event_Handler::register_stdin_handler (ACE_Event_Handler *eh, ACE_Thread_Manager *thr_mgr, int flags) { -#if defined (ACE_WIN32) || defined (ACE_PSOS) +#if defined (ACE_WIN32) ACE_UNUSED_ARG (reactor); eh->reactor (reactor); @@ -285,7 +285,7 @@ ACE_Event_Handler::register_stdin_handler (ACE_Event_Handler *eh, return reactor->register_handler (ACE_STDIN, eh, ACE_Event_Handler::READ_MASK); -#endif /* ACE_WIN32 || ACE_PSOS */ +#endif /* ACE_WIN32 */ } int diff --git a/ace/Local_Name_Space_T.cpp b/ace/Local_Name_Space_T.cpp index b626f990dbb..28266896f5a 100644 --- a/ace/Local_Name_Space_T.cpp +++ b/ace/Local_Name_Space_T.cpp @@ -421,15 +421,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void) ACE_OS::strcat (this->context_file_, ACE_DIRECTORY_SEPARATOR_STR); ACE_OS::strcat (this->context_file_, database); -#if !defined (CHORUS) ACE_MEM_POOL_OPTIONS options (this->name_options_->base_address ()); -#else - // Use base address == 0, don't use a fixed address. - ACE_MEM_POOL_OPTIONS options (0, - 0, - 0, - ACE_CHORUS_LOCAL_NAME_SPACE_T_SIZE); -#endif /* CHORUS */ ACE_TCHAR lock_name_for_local_name_space [MAXNAMELEN + MAXPATHLEN]; ACE_TCHAR lock_name_for_backing_store [MAXPATHLEN + MAXNAMELEN]; diff --git a/ace/Message_Block.cpp b/ace/Message_Block.cpp index 79ef07f3c26..36f34637eb0 100644 --- a/ace/Message_Block.cpp +++ b/ace/Message_Block.cpp @@ -126,7 +126,7 @@ ACE_Message_Block::crunch (void) if (this->rd_ptr_ > this->wr_ptr_) return -1; - size_t len = this->length (); + size_t const len = this->length (); (void) ACE_OS::memmove (this->base (), this->rd_ptr (), len); diff --git a/ace/Message_Block.h b/ace/Message_Block.h index 38d9f947d49..27a012c2d9a 100644 --- a/ace/Message_Block.h +++ b/ace/Message_Block.h @@ -456,16 +456,16 @@ public: /// Get the read pointer. char *rd_ptr (void) const; - /// Set the read pointer to <ptr>. + /// Set the read pointer to @a ptr. void rd_ptr (char *ptr); - /// Set the read pointer ahead <n> bytes. + /// Set the read pointer ahead @a n bytes. void rd_ptr (size_t n); /// Get the write pointer. char *wr_ptr (void) const; - /// Set the write pointer to <ptr>. + /// Set the write pointer to @a ptr. void wr_ptr (char *ptr); /// Set the write pointer ahead <n> bytes. This is used to compute diff --git a/ace/Mutex.cpp b/ace/Mutex.cpp index 83261c5d39d..18b95d45b8d 100644 --- a/ace/Mutex.cpp +++ b/ace/Mutex.cpp @@ -25,10 +25,10 @@ ACE_Mutex::dump (void) const // ACE_TRACE ("ACE_Mutex::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); -#if defined (CHORUS) || defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) +#if defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("lockname_ = %s\n"), this->lockname_)); ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("process_lock_ = %x\n"), this->process_lock_)); -#endif /* CHORUS || ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ +#endif /* ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -36,16 +36,16 @@ ACE_Mutex::dump (void) const ACE_Mutex::ACE_Mutex (int type, const ACE_TCHAR *name, ACE_mutexattr_t *arg, mode_t mode) : -#if defined (CHORUS) || defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) +#if defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) process_lock_ (0), lockname_ (0), -#endif /* CHORUS || ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ +#endif /* ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ removed_ (0) { // ACE_TRACE ("ACE_Mutex::ACE_Mutex"); // These platforms need process-wide mutex to be in shared memory. -#if defined (CHORUS) || defined(ACE_HAS_PTHREADS) || defined (ACE_HAS_STHREADS) +#if defined(ACE_HAS_PTHREADS) || defined (ACE_HAS_STHREADS) if (type == USYNC_PROCESS) { // Let's see if the shared memory entity already exists. @@ -102,7 +102,7 @@ ACE_Mutex::ACE_Mutex (int type, const ACE_TCHAR *name, // local mutex init if USYNC_PROCESS flag is not enabled. #else ACE_UNUSED_ARG (mode); -#endif /* CHORUS || ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ +#endif /* ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ if (ACE_OS::mutex_init (&this->lock_, type, @@ -111,9 +111,9 @@ ACE_Mutex::ACE_Mutex (int type, const ACE_TCHAR *name, ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_Mutex::ACE_Mutex"))); -#if defined (CHORUS) || defined(ACE_HAS_PTHREADS) || defined (ACE_HAS_STHREADS) +#if defined(ACE_HAS_PTHREADS) || defined (ACE_HAS_STHREADS) } -#endif /* CHORUS || ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ +#endif /* ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ } ACE_Mutex::~ACE_Mutex (void) diff --git a/ace/Mutex.h b/ace/Mutex.h index 278e0a9ab9d..81155d08dc4 100644 --- a/ace/Mutex.h +++ b/ace/Mutex.h @@ -151,7 +151,7 @@ public: // = This should be protected but some C++ compilers complain... public: -#if defined (CHORUS) || defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) +#if defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) /// This lock resides in shared memory. ACE_mutex_t *process_lock_; @@ -161,7 +161,7 @@ public: * can destroy it). */ const ACE_TCHAR *lockname_; -#endif /* CHORUS || ACE_HAS_PTHREADS */ +#endif /* ACE_HAS_PTHREADS */ /// Mutex type supported by the OS. ACE_mutex_t lock_; diff --git a/ace/Mutex.inl b/ace/Mutex.inl index 26fb51a0c50..17f81171553 100644 --- a/ace/Mutex.inl +++ b/ace/Mutex.inl @@ -11,10 +11,10 @@ ACE_INLINE int ACE_Mutex::acquire_read (void) { // ACE_TRACE ("ACE_Mutex::acquire_read"); -#if defined (CHORUS) || defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) +#if defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) if (this->process_lock_) return ACE_OS::mutex_lock (this->process_lock_); -#endif /* CHORUS || ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ +#endif /* ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ return ACE_OS::mutex_lock (&this->lock_); } @@ -22,10 +22,10 @@ ACE_INLINE int ACE_Mutex::acquire_write (void) { // ACE_TRACE ("ACE_Mutex::acquire_write"); -#if defined (CHORUS) || defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) +#if defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) if (this->process_lock_) return ACE_OS::mutex_lock (this->process_lock_); -#endif /* CHORUS || ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ +#endif /* ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ return ACE_OS::mutex_lock (&this->lock_); } @@ -33,10 +33,10 @@ ACE_INLINE int ACE_Mutex::tryacquire_read (void) { // ACE_TRACE ("ACE_Mutex::tryacquire_read"); -#if defined (CHORUS) || defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) +#if defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) if (this->process_lock_) return ACE_OS::mutex_trylock (this->process_lock_); -#endif /* CHORUS || ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ +#endif /* ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ return ACE_OS::mutex_trylock (&this->lock_); } @@ -44,10 +44,10 @@ ACE_INLINE const ACE_mutex_t & ACE_Mutex::lock (void) const { // ACE_TRACE ("ACE_Mutex::lock"); -#if defined (CHORUS) || defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) +#if defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) if (this->process_lock_) return *this->process_lock_; -#endif /* CHORUS || ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ +#endif /* ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ return this->lock_; } @@ -55,10 +55,10 @@ ACE_INLINE int ACE_Mutex::tryacquire_write (void) { // ACE_TRACE ("ACE_Mutex::tryacquire_write"); -#if defined (CHORUS) || defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) +#if defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) if (this->process_lock_) return ACE_OS::mutex_trylock (this->process_lock_); -#endif /* CHORUS || ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ +#endif /* ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ return ACE_OS::mutex_trylock (&this->lock_); } @@ -73,10 +73,10 @@ ACE_INLINE int ACE_Mutex::acquire (void) { // ACE_TRACE ("ACE_Mutex::acquire"); -#if defined (CHORUS) || defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) +#if defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) if (this->process_lock_) return ACE_OS::mutex_lock (this->process_lock_); -#endif /* CHORUS || ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ +#endif /* ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ return ACE_OS::mutex_lock (&this->lock_); } @@ -84,20 +84,20 @@ ACE_INLINE int ACE_Mutex::acquire (ACE_Time_Value &tv) { // ACE_TRACE ("ACE_Mutex::acquire"); - #if defined (CHORUS) || defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) + #if defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) if (this->process_lock_) return ACE_OS::mutex_lock (this->process_lock_, tv); -#endif /* CHORUS || ACE_HAS_PTHREADS || ACE_HAS_STHREADS*/ +#endif /* ACE_HAS_PTHREADS || ACE_HAS_STHREADS*/ return ACE_OS::mutex_lock (&this->lock_, tv); } ACE_INLINE int ACE_Mutex::acquire (ACE_Time_Value *tv) { - #if defined (CHORUS) || defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) + #if defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) if (this->process_lock_) return ACE_OS::mutex_lock (this->process_lock_, tv); -#endif /* CHORUS || ACE_HAS_PTHREADS || ACE_HAS_STHREADS*/ +#endif /* ACE_HAS_PTHREADS || ACE_HAS_STHREADS*/ return ACE_OS::mutex_lock (&this->lock_, tv); } @@ -105,10 +105,10 @@ ACE_INLINE int ACE_Mutex::tryacquire (void) { // ACE_TRACE ("ACE_Mutex::tryacquire"); -#if defined (CHORUS) || defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) +#if defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) if (this->process_lock_) return ACE_OS::mutex_trylock (this->process_lock_); -#endif /* CHORUS || ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ +#endif /* ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ return ACE_OS::mutex_trylock (&this->lock_); } @@ -116,10 +116,10 @@ ACE_INLINE int ACE_Mutex::release (void) { // ACE_TRACE ("ACE_Mutex::release"); -#if defined (CHORUS) || defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) +#if defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) if (this->process_lock_) return ACE_OS::mutex_unlock (this->process_lock_); -#endif /* CHORUS || ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ +#endif /* ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ return ACE_OS::mutex_unlock (&this->lock_); } @@ -128,7 +128,7 @@ ACE_Mutex::remove (void) { // ACE_TRACE ("ACE_Mutex::remove"); int result = 0; -#if defined (CHORUS) || defined (ACE_HAS_PTHREADS) || defined (ACE_HAS_STHREADS) +#if defined (ACE_HAS_PTHREADS) || defined (ACE_HAS_STHREADS) // In the case of a interprocess mutex, the owner is the first // process that created the shared memory object. In this case, the // lockname_ pointer will be non-zero (points to allocated memory @@ -159,16 +159,16 @@ ACE_Mutex::remove (void) } else { -#else /* !CHORUS && !ACE_HAS_PTHREADS && !ACE_HAS_STHREADS */ +#else /* !ACE_HAS_PTHREADS && !ACE_HAS_STHREADS */ if (this->removed_ == 0) { this->removed_ = 1; result = ACE_OS::mutex_destroy (&this->lock_); } -#endif /* CHORUS || ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ -#if defined (CHORUS) || defined (ACE_HAS_PTHREADS) || defined (ACE_HAS_STHREADS) +#endif /* ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ +#if defined (ACE_HAS_PTHREADS) || defined (ACE_HAS_STHREADS) } -#endif /* CHORUS || ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ +#endif /* ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ return result; } diff --git a/ace/Sched_Params.cpp b/ace/Sched_Params.cpp index e6395c148a3..e3c41477a75 100644 --- a/ace/Sched_Params.cpp +++ b/ace/Sched_Params.cpp @@ -102,9 +102,7 @@ ACE_Sched_Params::priority_min (const Policy policy, return ACE_THR_PRI_FIFO_MIN; case ACE_SCHED_RR: return ACE_THR_PRI_RR_MIN; -#if !defined (CHORUS) // SCHED_OTHRE and SCHED_RR have same value - case ACE_SCHED_OTHER: -#endif /* CHORUS */ + case ACE_SCHED_OTHER: default: return ACE_THR_PRI_OTHER_MIN; } @@ -117,9 +115,7 @@ ACE_Sched_Params::priority_min (const Policy policy, return ACE_PROC_PRI_FIFO_MIN; case ACE_SCHED_RR: return ACE_PROC_PRI_RR_MIN; -#if !defined (CHORUS) // SCHED_OTHRE and SCHED_RR have same value - case ACE_SCHED_OTHER: -#endif /* CHORUS */ + case ACE_SCHED_OTHER: default: return ACE_PROC_PRI_OTHER_MIN; } @@ -206,9 +202,7 @@ ACE_Sched_Params::priority_max (const Policy policy, return ACE_THR_PRI_FIFO_MAX; case ACE_SCHED_RR: return ACE_THR_PRI_RR_MAX; -#if !defined (CHORUS) // SCHED_OTHRE and SCHED_RR have same value - case ACE_SCHED_OTHER: -#endif /* CHORUS */ + case ACE_SCHED_OTHER: default: return ACE_THR_PRI_OTHER_MAX; } @@ -221,9 +215,7 @@ ACE_Sched_Params::priority_max (const Policy policy, return ACE_PROC_PRI_FIFO_MAX; case ACE_SCHED_RR: return ACE_PROC_PRI_RR_MAX; -#if !defined (CHORUS) // SCHED_OTHRE and SCHED_RR have same value - case ACE_SCHED_OTHER: -#endif /* CHORUS */ + case ACE_SCHED_OTHER: default: return ACE_PROC_PRI_OTHER_MAX; } diff --git a/ace/Select_Reactor_T.cpp b/ace/Select_Reactor_T.cpp index 6d6d5b8e5a6..dd321ac6e61 100644 --- a/ace/Select_Reactor_T.cpp +++ b/ace/Select_Reactor_T.cpp @@ -654,18 +654,18 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::register_handler int result = 0; -#if (ACE_NSIG > 0) && !defined (CHORUS) +#if (ACE_NSIG > 0) for (int s = 1; s < ACE_NSIG; ++s) if ((sigset.is_member (s) == 1) && this->signal_handler_->register_handler (s, new_sh, new_disp) == -1) result = -1; -#else /* ACE_NSIG <= 0 || CHORUS */ +#else /* ACE_NSIG <= 0 */ ACE_UNUSED_ARG (sigset); ACE_UNUSED_ARG (new_sh); ACE_UNUSED_ARG (new_disp); -#endif /* ACE_NSIG <= 0 || CHORUS */ +#endif /* ACE_NSIG <= 0 */ return result; } @@ -676,14 +676,14 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::remove_handler ACE_TRACE ("ACE_Select_Reactor_T::remove_handler"); int result = 0; -#if (ACE_NSIG > 0) && !defined (CHORUS) +#if (ACE_NSIG > 0) for (int s = 1; s < ACE_NSIG; ++s) if ((sigset.is_member (s) == 1) && this->signal_handler_->remove_handler (s) == -1) result = -1; -#else /* ACE_NSIG <= 0 || CHORUS */ +#else /* ACE_NSIG <= 0 */ ACE_UNUSED_ARG (sigset); -#endif /* ACE_NSIG <= 0 || CHORUS */ +#endif /* ACE_NSIG <= 0 */ return result; } diff --git a/ace/Signal.cpp b/ace/Signal.cpp index b90607968f4..12ac1984605 100644 --- a/ace/Signal.cpp +++ b/ace/Signal.cpp @@ -190,13 +190,13 @@ ACE_Sig_Action::ACE_Sig_Action (const ACE_Sig_Set &signals, this->sa_.sa_handler = (void (*)()) ACE_SignalHandlerV (sig_handler); #endif /* !ACE_HAS_TANDEM_SIGNALS */ -#if (ACE_NSIG > 0) && !defined (CHORUS) +#if (ACE_NSIG > 0) for (int s = 1; s < ACE_NSIG; s++) if ((signals.is_member (s)) == 1) ACE_OS::sigaction (s, &this->sa_, 0); -#else /* ACE_NSIG <= 0 || CHORUS */ +#else /* ACE_NSIG <= 0 */ ACE_UNUSED_ARG (signals); -#endif /* ACE_NSIG <= 0 || CHORUS */ +#endif /* ACE_NSIG <= 0 */ } ACE_Sig_Action::ACE_Sig_Action (const ACE_Sig_Set &signals, @@ -218,13 +218,13 @@ ACE_Sig_Action::ACE_Sig_Action (const ACE_Sig_Set &signals, this->sa_.sa_handler = (void (*)()) ACE_SignalHandlerV (sig_handler); #endif /* !ACE_HAS_TANDEM_SIGNALS */ -#if (ACE_NSIG > 0) && !defined (CHORUS) +#if (ACE_NSIG > 0) for (int s = 1; s < ACE_NSIG; s++) if ((signals.is_member (s)) == 1) ACE_OS::sigaction (s, &this->sa_, 0); -#else /* ACE_NSIG <= 0 || CHORUS */ +#else /* ACE_NSIG <= 0 */ ACE_UNUSED_ARG (signals); -#endif /* ACE_NSIG <= 0 || CHORUS */ +#endif /* ACE_NSIG <= 0 */ } ACE_ALLOC_HOOK_DEFINE(ACE_Sig_Handler) diff --git a/bin/MakeProjectCreator/config/taoidldefaults.mpb b/bin/MakeProjectCreator/config/taoidldefaults.mpb index 0070e484a40..2694efa53b3 100644 --- a/bin/MakeProjectCreator/config/taoidldefaults.mpb +++ b/bin/MakeProjectCreator/config/taoidldefaults.mpb @@ -24,7 +24,7 @@ project { // Inline related options optional(inline_outputext) { - commandflags(!-SS && !-Ssi || !-Sci || !-Sc) += .inl, .i + commandflags(!-SS && !-Ssi || !-Sci || -GT) += .inl, .i } optional(inline_pre_extension) { commandflags(!-SS && !-Ssi) += S @@ -33,7 +33,7 @@ project { commandflags(!-Sci) += C } optional(inline_pre_extension) { - commandflags(!-Sc && !-SS) += S_T + commandflags(-GT && !-SS) += S_T } // Source related options @@ -46,10 +46,10 @@ project { // Other optional(template_outputext) { - commandflags(!-Sc && !-SS) += S_T.cpp, S_T.cxx, S_T.cc, S_T.C + commandflags(-GT && !-SS) += S_T.cpp, S_T.cxx, S_T.cc, S_T.C } optional(header_pre_extension) { - commandflags(!-Sc && !-SS) += S_T + commandflags(-GT && !-SS) += S_T } optional(header_pre_extension) { commandflags(-GA) += A |