summaryrefslogtreecommitdiff
path: root/TAO/tao
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao')
-rw-r--r--TAO/tao/Object.pidl44
-rw-r--r--TAO/tao/Strategies/SCIOP_Factory.cpp2
2 files changed, 1 insertions, 45 deletions
diff --git a/TAO/tao/Object.pidl b/TAO/tao/Object.pidl
deleted file mode 100644
index 421f9e3be36..00000000000
--- a/TAO/tao/Object.pidl
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// $Id$
-//
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
- typedef unsigned long PolicyType;
- interface Policy {};
-
- typedef sequence<Policy> PolicyList;
-
- enum SetOverrideType
- {
- SET_OVERRIDE,
- ADD_OVERRIDE
- };
-
- exception InvalidPolicies
- {
- sequence<unsigned short> indices;
- };
-
- typedef sequence<PolicyType> PolicyTypeSeq;
-
- interface Object
- {
- Policy get_policy (in PolicyType type);
- Policy get_client_policy (in PolicyType type);
-
- Object set_policy_overrides (
- in PolicyList policies,
- in SetOverrideType set_add)
- raises (InvalidPolicies);
-
- PolicyList get_policy_overrides (
- in PolicyTypeSeq types);
- boolean validate_connection (
- out PolicyList inconsistent_policies);
- };
-};
-
-#pragma prefix ""
diff --git a/TAO/tao/Strategies/SCIOP_Factory.cpp b/TAO/tao/Strategies/SCIOP_Factory.cpp
index 59c169cb925..0383f053e2a 100644
--- a/TAO/tao/Strategies/SCIOP_Factory.cpp
+++ b/TAO/tao/Strategies/SCIOP_Factory.cpp
@@ -76,7 +76,7 @@ TAO_SCIOP_Protocol_Factory::make_connector (void)
int
TAO_SCIOP_Protocol_Factory::requires_explicit_endpoint (void) const
{
- return 0;
+ return 1;
}
ACE_STATIC_SVC_DEFINE (TAO_SCIOP_Protocol_Factory,