summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/CosTrading.idl
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-08-14 20:12:03 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-08-14 20:12:03 +0000
commitda49b08671e5d87c9996bb0bcc63c661447f83b2 (patch)
tree4b92710abc7aef7d79efb811391b9254038b5480 /TAO/orbsvcs/orbsvcs/CosTrading.idl
parent66e74009620c1297b07ce26dab97f586ed76edc7 (diff)
downloadATCD-da49b08671e5d87c9996bb0bcc63c661447f83b2.tar.gz
ChangeLogTag:Fri Aug 14 14:44:49 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/CosTrading.idl')
-rw-r--r--TAO/orbsvcs/orbsvcs/CosTrading.idl11
1 files changed, 0 insertions, 11 deletions
diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.idl b/TAO/orbsvcs/orbsvcs/CosTrading.idl
index 55f3e213a0f..54111f88ddf 100644
--- a/TAO/orbsvcs/orbsvcs/CosTrading.idl
+++ b/TAO/orbsvcs/orbsvcs/CosTrading.idl
@@ -13,8 +13,6 @@
//
// ========================================================================
-#define TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG
-
module CosTrading
{
// forward references to our interfaces
@@ -343,13 +341,8 @@ module CosTrading
{
struct LinkInfo
{
-#ifdef TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG
- string target;
- string target_reg;
-#else
Lookup target;
Register target_reg;
-#endif
FollowOption def_pass_on_follow_rule;
FollowOption limiting_follow_rule;
};
@@ -544,11 +537,7 @@ module CosTradingDynamic
};
struct DynamicProp {
-#ifdef TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG
- string eval_if;
-#else
DynamicPropEval eval_if;
-#endif /* TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG */
TypeCode returned_type;
any extra_info;
};