summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TAO/ChangeLog24
-rw-r--r--TAO/tao/CONV_FRAME.pidl3
-rw-r--r--TAO/tao/Messaging/Messaging_No_Impl.pidl30
-rw-r--r--TAO/tao/Policy.pidl5
-rw-r--r--TAO/tao/RTPortableServer/RTPortableServer.pidl4
-rw-r--r--TAO/tao/UShortSeq.pidl32
-rw-r--r--TAO/tao/orb.idl7
7 files changed, 58 insertions, 47 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 79436bfcb1e..98b141f293c 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,20 +1,32 @@
+Tue Jan 6 15:03:13 2004 Boris Kolpackov <boris@dre.vanderbilt.edu>
+
+ * tao/CONV_FRAME.pidl:
+ * tao/Policy.pidl:
+ * tao/UShortSeq.pidl:
+ * tao/orb.idl:
+ * tao/Messaging/Messaging_No_Impl.pidl:
+ * tao/RTPortableServer/RTPortableServer.pidl:
+
+ Fixed name redefinition bugs and recoded usage of deprecated
+ anonymous sequences.
+
Tue Jan 6 12:04:18 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
* tao/Strategies/SCIOP_Factory.cpp:
-
+
SCIOP requires explicit endpoint specification. It shouldn't get
- loaded automatically as it is getting done now.
+ loaded automatically as it is getting done now.
* tao/Object.pidl:
- Another legacy file that is getting removed.
+ Another legacy file that is getting removed.
Tue Jan 6 11:14:57 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
* tao/IFR_Client/Interface.pidl:
Removed this file form the repo since it is not used and
- woefully out of date.
+ woefully out of date.
Tue Jan 6 11:13:00 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
@@ -37,7 +49,7 @@ Mon Jan 5 19:09:41 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
Mon Jan 5 18:37:22 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
* orbsvcs/tests/FT_App/FT_App.mpc:
-
+
Cosmetic fix.
Mon Jan 5 15:33:33 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
@@ -50,7 +62,7 @@ Mon Jan 5 14:14:25 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
* orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp:
- Applied patches from Dale Wilson for warnings in g++ builds.
+ Applied patches from Dale Wilson for warnings in g++ builds.
Mon Jan 5 13:54:09 2004 Chad Elliott <elliott_c@ociweb.com>
diff --git a/TAO/tao/CONV_FRAME.pidl b/TAO/tao/CONV_FRAME.pidl
index 85be37406d5..0d8885193bf 100644
--- a/TAO/tao/CONV_FRAME.pidl
+++ b/TAO/tao/CONV_FRAME.pidl
@@ -26,10 +26,11 @@
module CONV_FRAME {
typedef unsigned long CodeSetId;
+ typedef sequence<CodeSetId> CodeSetIdSeq;
struct CodeSetComponent {
CodeSetId native_code_set;
- sequence<CodeSetId> conversion_code_sets;
+ CodeSetIdSeq conversion_code_sets;
};
struct CodeSetComponentInfo {
diff --git a/TAO/tao/Messaging/Messaging_No_Impl.pidl b/TAO/tao/Messaging/Messaging_No_Impl.pidl
index 4c377e2e81a..358d0d87618 100644
--- a/TAO/tao/Messaging/Messaging_No_Impl.pidl
+++ b/TAO/tao/Messaging/Messaging_No_Impl.pidl
@@ -137,36 +137,6 @@ module Messaging
local interface QueueOrderPolicy : CORBA::Policy {
readonly attribute Ordering allowed_orders;
};
-
-#if 0
- //
- // Base value for the Polling model
- //
-
-#if defined(NO_VALUE)
- local interface Poller : CORBA::Pollable {
- readonly attribute Object operation_target;
- readonly attribute string operation_name;
-
- attribute ReplyHandler associated_handler;
- readonly attribute boolean is_from_poller;
-
- readonly attribute Object target;
- readonly attribute string op_name;
- };
-#else
- valuetype Poller supports CORBA::Pollable {
- readonly attribute Object operation_target;
- readonly attribute string operation_name;
-
- attribute ReplyHandler associated_handler;
- readonly attribute boolean is_from_poller;
-
- public Object target;
- public string op_name;
- };
-#endif
-#endif /* 0 */
};
#endif /*TAO_MESSAGING_NO_IMPL_PIDL*/
diff --git a/TAO/tao/Policy.pidl b/TAO/tao/Policy.pidl
index cf604241bf1..7858a4a9239 100644
--- a/TAO/tao/Policy.pidl
+++ b/TAO/tao/Policy.pidl
@@ -42,6 +42,7 @@
#ifndef TAO_CORBA_POLICY_PIDL
#define TAO_CORBA_POLICY_PIDL
+#include <UShortSeq.pidl>
#include <Current.pidl>
#include <Policy_Forward.pidl>
@@ -60,10 +61,6 @@ module CORBA
{
PolicyErrorCode reason;
};
-
- //@@ should be replaced with the inclusion of UShortSeq.pidl
- //
- typedef sequence<unsigned short> UShortSeq;
exception InvalidPolicies
{
diff --git a/TAO/tao/RTPortableServer/RTPortableServer.pidl b/TAO/tao/RTPortableServer/RTPortableServer.pidl
index 9f40c2719f2..c330015ba0a 100644
--- a/TAO/tao/RTPortableServer/RTPortableServer.pidl
+++ b/TAO/tao/RTPortableServer/RTPortableServer.pidl
@@ -34,8 +34,8 @@
#ifndef _RT_PORTABLE_SERVER_IDL_
#define _RT_PORTABLE_SERVER_IDL_
-#include <../PortableServer/PortableServer.pidl>
-#include <../RTCORBA/RTCORBA.pidl>
+#include <tao/PortableServer/PortableServer.pidl>
+#include <tao/RTCORBA/RTCORBA.pidl>
#pragma prefix "omg.org"
diff --git a/TAO/tao/UShortSeq.pidl b/TAO/tao/UShortSeq.pidl
new file mode 100644
index 00000000000..3628e2f1643
--- /dev/null
+++ b/TAO/tao/UShortSeq.pidl
@@ -0,0 +1,32 @@
+// -*- IDL -*-
+//
+// $Id$
+
+// ================================================================
+//
+// This file was used to generate the code in UShortSeqC.*
+// The command used to generate code is:
+//
+// tao_idl
+// -o orig -Ge 1 -GT -GA
+// -Wb,export_macro=TAO_Export
+// -Wb,pre_include="ace/pre.h"
+// -Wb,post_include="ace/post.h"
+// UShortSeq.pidl
+//
+// Patches for changes to the generated code are available in the
+// `diffs' directory.
+// ================================================================
+
+
+#ifndef TAO_CORBA_U_SHORT_SEQ_IDL
+#define TAO_CORBA_U_SHORT_SEQ_IDL
+
+#pragma prefix "omg.org"
+
+module CORBA
+{
+ typedef sequence<unsigned short> UShortSeq;
+};
+
+#endif /* TAO_CORBA_U_SHORT_SEQ_IDL */
diff --git a/TAO/tao/orb.idl b/TAO/tao/orb.idl
index 04b4baa5547..9d0f0654988 100644
--- a/TAO/tao/orb.idl
+++ b/TAO/tao/orb.idl
@@ -7,6 +7,9 @@
#ifndef TAO_ORB_IDL
#define TAO_ORB_IDL
+#include <OctetSeq.pidl>
+#include <StringSeq.pidl>
+
#include <Policy.pidl>
#include <Services.pidl>
@@ -95,10 +98,6 @@ module CORBA
typedef string ObjectId;
typedef sequence <ObjectId> ObjectIdList;
-
- // Portable Interceptor specification adds these types.
- typedef sequence<string> StringSeq;
- typedef sequence<wstring> WStringSeq;
};
#endif /* TAO_ORB_IDL */
View Lorry Controller Status