summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2006-05-09 07:36:18 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2006-05-09 07:36:18 +0000
commit9f3f56f0be34c0faf11dc4798de1d281f137a024 (patch)
tree1fb3a1fd34f5827ecf79bee0b1411070e59616cb /TAO
parenta53aefe4af2e2da48613a9a783c485a47672edc4 (diff)
downloadATCD-9f3f56f0be34c0faf11dc4798de1d281f137a024.tar.gz
ChangeLogTag: Tue May 10 07:18:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO')
-rw-r--r--TAO/NEWS6
-rw-r--r--TAO/TAO_IDL/be/be_global.cpp22
-rw-r--r--TAO/docs/compiler.html17
-rw-r--r--TAO/examples/POA/TIE/POA_TIE.mpc1
-rw-r--r--TAO/tao/AnyTypeCode/AnySeq.pidl2
-rw-r--r--TAO/tao/AnyTypeCode/Bounds.pidl2
-rw-r--r--TAO/tao/AnyTypeCode/Dynamic.pidl2
-rw-r--r--TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl2
-rw-r--r--TAO/tao/AnyTypeCode/ValueModifier.pidl2
-rw-r--r--TAO/tao/AnyTypeCode/Visibility.pidl2
-rw-r--r--TAO/tao/BooleanSeq.pidl2
-rw-r--r--TAO/tao/CSD_Framework/CSD_Framework.pidl4
-rw-r--r--TAO/tao/CharSeq.pidl2
-rw-r--r--TAO/tao/CodecFactory/IOP_Codec.pidl2
-rw-r--r--TAO/tao/CodecFactory/IOP_Codec_include.pidl2
-rw-r--r--TAO/tao/Current.pidl2
-rw-r--r--TAO/tao/DoubleSeq.pidl2
-rw-r--r--TAO/tao/DynamicAny/DynamicAny.pidl2
-rw-r--r--TAO/tao/EndpointPolicy/EndpointPolicy.pidl2
-rw-r--r--TAO/tao/EndpointPolicy/EndpointPolicyType.pidl2
-rw-r--r--TAO/tao/EndpointPolicy/IIOPEndpointValue.pidl2
-rw-r--r--TAO/tao/FloatSeq.pidl2
-rw-r--r--TAO/tao/IFR_Client/IFR_Base.pidl2
-rw-r--r--TAO/tao/IFR_Client/IFR_Basic.pidl2
-rw-r--r--TAO/tao/IFR_Client/IFR_Components.pidl2
-rw-r--r--TAO/tao/IFR_Client/IFR_Extended.pidl2
-rw-r--r--TAO/tao/IIOP.pidl2
-rw-r--r--TAO/tao/IIOP_Endpoints.pidl2
-rw-r--r--TAO/tao/IOP_IOR.pidl2
-rw-r--r--TAO/tao/IORInterceptor/IORInfo.pidl2
-rw-r--r--TAO/tao/IORInterceptor/IORInterceptor.pidl2
-rw-r--r--TAO/tao/IORManipulation/IOR.pidl2
-rw-r--r--TAO/tao/ImR_Client/ImplRepo.pidl2
-rw-r--r--TAO/tao/ImR_Client/ServerObject.pidl2
-rw-r--r--TAO/tao/LongDoubleSeq.pidl2
-rw-r--r--TAO/tao/LongLongSeq.pidl2
-rw-r--r--TAO/tao/LongSeq.pidl2
-rw-r--r--TAO/tao/Messaging/Messaging_No_Impl.pidl2
-rw-r--r--TAO/tao/Messaging/Messaging_RT_Policy.pidl2
-rw-r--r--TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl2
-rw-r--r--TAO/tao/Messaging/TAO_Ext.pidl2
-rw-r--r--TAO/tao/Messaging_PolicyValue.pidl2
-rw-r--r--TAO/tao/Messaging_SyncScope.pidl2
-rw-r--r--TAO/tao/ObjRefTemplate/Default_ORT.pidl2
-rw-r--r--TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl2
-rw-r--r--TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_include.pidl2
-rw-r--r--TAO/tao/Object_Key.pidl2
-rw-r--r--TAO/tao/OctetSeq.pidl2
-rw-r--r--TAO/tao/PI/ClientRequestInfo.pidl2
-rw-r--r--TAO/tao/PI/ClientRequestInterceptor.pidl2
-rw-r--r--TAO/tao/PI/Interceptor.pidl2
-rw-r--r--TAO/tao/PI/InvalidSlot.pidl2
-rw-r--r--TAO/tao/PI/ORBInitInfo.pidl2
-rw-r--r--TAO/tao/PI/ORBInitializer.pidl2
-rw-r--r--TAO/tao/PI/PICurrent.pidl2
-rw-r--r--TAO/tao/PI/PIForwardRequest.pidl2
-rw-r--r--TAO/tao/PI/PolicyFactory.pidl2
-rw-r--r--TAO/tao/PI/ProcessingModePolicy.pidl2
-rw-r--r--TAO/tao/PI/RequestInfo.pidl2
-rw-r--r--TAO/tao/PI_Forward.pidl2
-rw-r--r--TAO/tao/PI_Server/ServerRequestInfo.pidl2
-rw-r--r--TAO/tao/PI_Server/ServerRequestInterceptor.pidl2
-rw-r--r--TAO/tao/ParameterMode.pidl2
-rw-r--r--TAO/tao/Policy_Forward.pidl2
-rw-r--r--TAO/tao/PortableInterceptor.pidl2
-rw-r--r--TAO/tao/PortableServer/AdapterActivator.pidl2
-rw-r--r--TAO/tao/PortableServer/ForwardRequest.pidl2
-rw-r--r--TAO/tao/PortableServer/IdAssignmentPolicy.pidl2
-rw-r--r--TAO/tao/PortableServer/IdUniquenessPolicy.pidl2
-rw-r--r--TAO/tao/PortableServer/ImplicitActivationPolicy.pidl2
-rw-r--r--TAO/tao/PortableServer/LifespanPolicy.pidl2
-rw-r--r--TAO/tao/PortableServer/POAManager.pidl2
-rw-r--r--TAO/tao/PortableServer/POAManagerFactory.pidl2
-rw-r--r--TAO/tao/PortableServer/PS_Current.pidl2
-rw-r--r--TAO/tao/PortableServer/PS_Forward.pidl2
-rw-r--r--TAO/tao/PortableServer/PortableServer.pidl4
-rw-r--r--TAO/tao/PortableServer/PortableServer_include.pidl2
-rw-r--r--TAO/tao/PortableServer/RequestProcessingPolicy.pidl2
-rw-r--r--TAO/tao/PortableServer/ServantActivator.pidl2
-rw-r--r--TAO/tao/PortableServer/ServantLocator.pidl2
-rw-r--r--TAO/tao/PortableServer/ServantManager.pidl2
-rw-r--r--TAO/tao/PortableServer/ServantRetentionPolicy.pidl2
-rw-r--r--TAO/tao/PortableServer/ThreadPolicy.pidl2
-rw-r--r--TAO/tao/RTCORBA/RTCORBA_include.pidl6
-rw-r--r--TAO/tao/RTPortableServer/RTPortableServer.pidl2
-rw-r--r--TAO/tao/RTPortableServer/RTPortableServer_include.pidl2
-rw-r--r--TAO/tao/RTScheduling/RTScheduler_include.pidl2
-rw-r--r--TAO/tao/ShortSeq.pidl2
-rw-r--r--TAO/tao/Strategies/sciop_endpoints.pidl2
-rw-r--r--TAO/tao/Strategies/uiop_endpoints.pidl2
-rw-r--r--TAO/tao/StringSeq.pidl2
-rw-r--r--TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl2
-rw-r--r--TAO/tao/ULongLongSeq.pidl2
-rw-r--r--TAO/tao/ULongSeq.pidl2
-rw-r--r--TAO/tao/UShortSeq.pidl2
-rw-r--r--TAO/tao/WCharSeq.pidl2
-rw-r--r--TAO/tao/WStringSeq.pidl2
-rw-r--r--TAO/tao/WrongTransaction.pidl2
-rw-r--r--TAO/tao/orb_types.pidl2
99 files changed, 125 insertions, 119 deletions
diff --git a/TAO/NEWS b/TAO/NEWS
index 190cb8cceb3..24e0fe6c515 100644
--- a/TAO/NEWS
+++ b/TAO/NEWS
@@ -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>&nbsp;</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>&nbsp;</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>&nbsp;</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"