summaryrefslogtreecommitdiff
path: root/TAO/tao
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao')
-rw-r--r--TAO/tao/Context.cpp6
-rw-r--r--TAO/tao/Context.h4
-rw-r--r--TAO/tao/DynAnyC.h263
-rw-r--r--TAO/tao/Makefile2
-rw-r--r--TAO/tao/ORB.cpp150
-rw-r--r--TAO/tao/ORB.h16
-rw-r--r--TAO/tao/Object_Adapter.cpp4
-rw-r--r--TAO/tao/POA.i4
-rw-r--r--TAO/tao/POAC.i19
-rw-r--r--TAO/tao/Typecode_Constants.cpp578
-rw-r--r--TAO/tao/corbafwd.h38
11 files changed, 432 insertions, 652 deletions
diff --git a/TAO/tao/Context.cpp b/TAO/tao/Context.cpp
index 412360dd569..486ab584d3f 100644
--- a/TAO/tao/Context.cpp
+++ b/TAO/tao/Context.cpp
@@ -1,6 +1,10 @@
// $Id$
+
#include "tao/Context.h"
+
+#if !defined (TAO_HAS_MINIMUM_CORBA)
+
#include "tao/Typecode.h"
#include "tao/Environment.h"
#include "tao/NVList.h"
@@ -167,3 +171,5 @@ CORBA_ContextList::_destroy (void)
if (current == 0)
delete this;
}
+
+#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/Context.h b/TAO/tao/Context.h
index 4647dc45ef0..f24fd9d4939 100644
--- a/TAO/tao/Context.h
+++ b/TAO/tao/Context.h
@@ -22,6 +22,8 @@
#include "tao/corbafwd.h"
+#if !defined (TAO_HAS_MINIMUM_CORBA)
+
class TAO_Export CORBA_Context
{
// = TITLE
@@ -288,4 +290,6 @@ private:
# include "tao/Context.i"
#endif /* __ACE_INLINE__ */
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
#endif /* TAO_CONTEXT_H */
diff --git a/TAO/tao/DynAnyC.h b/TAO/tao/DynAnyC.h
index 735b1c4807a..db5d3f4a414 100644
--- a/TAO/tao/DynAnyC.h
+++ b/TAO/tao/DynAnyC.h
@@ -45,18 +45,9 @@
#endif /* _MSC_VER */
-#if !defined (_CORBA_DYNANY___PTR_CH_)
-#define _CORBA_DYNANY___PTR_CH_
-
class CORBA_DynAny;
typedef CORBA_DynAny *CORBA_DynAny_ptr;
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DYNANY___VAR_CH_)
-#define _CORBA_DYNANY___VAR_CH_
-
class CORBA_DynAny_var
{
public:
@@ -83,13 +74,6 @@ private:
CORBA_DynAny_ptr ptr_;
};
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DYNANY___OUT_CH_)
-#define _CORBA_DYNANY___OUT_CH_
-
class CORBA_DynAny_out
{
public:
@@ -107,13 +91,6 @@ private:
CORBA_DynAny_ptr &ptr_;
};
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DYNANY_CH_)
-#define _CORBA_DYNANY_CH_
-
class TAO_Export CORBA_DynAny : public virtual ACE_CORBA_1 (Object)
{
public:
@@ -131,19 +108,9 @@ public:
);
static CORBA_DynAny_ptr _nil (void);
-
-#if !defined (_CORBA_DYNANY_INVALID___PTR_CH_)
-#define _CORBA_DYNANY_INVALID___PTR_CH_
-
class Invalid;
typedef Invalid *Invalid_ptr;
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DYNANY_INVALID_CH_)
-#define _CORBA_DYNANY_INVALID_CH_
-
class TAO_Export Invalid : public CORBA::UserException
{
public:
@@ -170,22 +137,9 @@ public:
static CORBA::TypeCode_ptr _tc_Invalid;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DYNANY_INVALIDVALUE___PTR_CH_)
-#define _CORBA_DYNANY_INVALIDVALUE___PTR_CH_
-
class InvalidValue;
typedef InvalidValue *InvalidValue_ptr;
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DYNANY_INVALIDVALUE_CH_)
-#define _CORBA_DYNANY_INVALIDVALUE_CH_
-
class TAO_Export InvalidValue : public CORBA::UserException
{
public:
@@ -212,22 +166,9 @@ public:
static CORBA::TypeCode_ptr _tc_InvalidValue;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DYNANY_TYPEMISMATCH___PTR_CH_)
-#define _CORBA_DYNANY_TYPEMISMATCH___PTR_CH_
-
class TypeMismatch;
typedef TypeMismatch *TypeMismatch_ptr;
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DYNANY_TYPEMISMATCH_CH_)
-#define _CORBA_DYNANY_TYPEMISMATCH_CH_
-
class TAO_Export TypeMismatch : public CORBA::UserException
{
public:
@@ -254,22 +195,9 @@ public:
static CORBA::TypeCode_ptr _tc_TypeMismatch;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DYNANY_INVALIDSEQ___PTR_CH_)
-#define _CORBA_DYNANY_INVALIDSEQ___PTR_CH_
-
class InvalidSeq;
typedef InvalidSeq *InvalidSeq_ptr;
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DYNANY_INVALIDSEQ_CH_)
-#define _CORBA_DYNANY_INVALIDSEQ_CH_
-
class TAO_Export InvalidSeq : public CORBA::UserException
{
public:
@@ -296,9 +224,6 @@ public:
static CORBA::TypeCode_ptr _tc_InvalidSeq;
-
-#endif /* end #if !defined */
-
virtual CORBA::TypeCode_ptr type (
CORBA::Environment &_tao_environment =
CORBA::Environment::default_environment ()
@@ -504,24 +429,11 @@ private:
void operator= (const CORBA_DynAny &);
};
-
-#endif /* end #if !defined */
-
extern CORBA::TypeCode_ptr _tc_CORBA_DynAny;
-
-#if !defined (_CORBA_DYNENUM___PTR_CH_)
-#define _CORBA_DYNENUM___PTR_CH_
-
class CORBA_DynEnum;
typedef CORBA_DynEnum *CORBA_DynEnum_ptr;
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DYNENUM___VAR_CH_)
-#define _CORBA_DYNENUM___VAR_CH_
-
class CORBA_DynEnum_var
{
public:
@@ -547,13 +459,6 @@ private:
CORBA_DynEnum_ptr ptr_;
};
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DYNENUM___OUT_CH_)
-#define _CORBA_DYNENUM___OUT_CH_
-
class CORBA_DynEnum_out
{
public:
@@ -571,13 +476,6 @@ private:
CORBA_DynEnum_ptr &ptr_;
};
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DYNENUM_CH_)
-#define _CORBA_DYNENUM_CH_
-
class TAO_Export CORBA_DynEnum: public virtual CORBA_DynAny
{
public:
@@ -631,9 +529,6 @@ private:
void operator= (const CORBA_DynEnum &);
};
-
-#endif /* end #if !defined */
-
extern CORBA::TypeCode_ptr _tc_CORBA_DynEnum;
typedef char * FieldName;
@@ -703,10 +598,6 @@ struct NameValuePair
extern CORBA::TypeCode_ptr _tc_NameValuePair;
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_NAMEVALUEPAIRSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_NAMEVALUEPAIRSEQ_CH_
-
class _TAO_Unbounded_Sequence_NameValuePairSeq : public TAO_Unbounded_Base_Sequence
{
public:
@@ -893,8 +784,6 @@ public:
};
-#endif /* end #if !defined */
-
// Forward declarations.
class NameValuePairSeq;
typedef NameValuePairSeq *NameValuePairSeq_ptr;
@@ -931,13 +820,6 @@ private:
NameValuePairSeq *ptr_;
};
-
-#endif /* end #if !defined */
-
-
-#if !defined (_NAMEVALUEPAIRSEQ___OUT_CH_)
-#define _NAMEVALUEPAIRSEQ___OUT_CH_
-
class NameValuePairSeq_out
{
public:
@@ -957,12 +839,6 @@ private:
void operator= (const NameValuePairSeq_var &);
};
-
-#endif /* end #if !defined */
-
-#if !defined (_NAMEVALUEPAIRSEQ_CH_)
-#define _NAMEVALUEPAIRSEQ_CH_
-
// *************************************************************
// NameValuePairSeq
// *************************************************************
@@ -994,27 +870,11 @@ public:
};
-#endif /* end #if !defined */
-
-
-#if !defined (_NAMEVALUEPAIRSEQ___VAR_CH_)
-#define _NAMEVALUEPAIRSEQ___VAR_CH_
-
extern CORBA::TypeCode_ptr _tc_NameValuePairSeq;
-
-#if !defined (_CORBA_DYNSTRUCT___PTR_CH_)
-#define _CORBA_DYNSTRUCT___PTR_CH_
-
class CORBA_DynStruct;
typedef CORBA_DynStruct *CORBA_DynStruct_ptr;
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DYNSTRUCT___VAR_CH_)
-#define _CORBA_DYNSTRUCT___VAR_CH_
-
class CORBA_DynStruct_var
{
public:
@@ -1040,13 +900,6 @@ private:
CORBA_DynStruct_ptr ptr_;
};
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DYNSTRUCT___OUT_CH_)
-#define _CORBA_DYNSTRUCT___OUT_CH_
-
class CORBA_DynStruct_out
{
public:
@@ -1064,13 +917,6 @@ private:
CORBA_DynStruct_ptr &ptr_;
};
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DYNSTRUCT_CH_)
-#define _CORBA_DYNSTRUCT_CH_
-
class TAO_Export CORBA_DynStruct: public virtual CORBA_DynAny
{
public:
@@ -1123,24 +969,11 @@ private:
void operator= (const CORBA_DynStruct &);
};
-
-#endif /* end #if !defined */
-
extern CORBA::TypeCode_ptr _tc_CORBA_DynStruct;
-
-#if !defined (_CORBA_DYNUNION___PTR_CH_)
-#define _CORBA_DYNUNION___PTR_CH_
-
class CORBA_DynUnion;
typedef CORBA_DynUnion *CORBA_DynUnion_ptr;
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DYNUNION___VAR_CH_)
-#define _CORBA_DYNUNION___VAR_CH_
-
class CORBA_DynUnion_var
{
public:
@@ -1166,13 +999,6 @@ private:
CORBA_DynUnion_ptr ptr_;
};
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DYNUNION___OUT_CH_)
-#define _CORBA_DYNUNION___OUT_CH_
-
class CORBA_DynUnion_out
{
public:
@@ -1190,13 +1016,6 @@ private:
CORBA_DynUnion_ptr &ptr_;
};
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DYNUNION_CH_)
-#define _CORBA_DYNUNION_CH_
-
class TAO_Export CORBA_DynUnion: public virtual CORBA_DynAny
{
public:
@@ -1266,15 +1085,8 @@ private:
void operator= (const CORBA_DynUnion &);
};
-
-#endif /* end #if !defined */
-
extern CORBA::TypeCode_ptr _tc_CORBA_DynUnion;
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_ANYSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_ANYSEQ_CH_
-
class _TAO_Unbounded_Sequence_AnySeq : public TAO_Unbounded_Base_Sequence
{
public:
@@ -1461,15 +1273,10 @@ public:
};
-#endif /* end #if !defined */
-
// Forward declarations.
class AnySeq;
typedef AnySeq *AnySeq_ptr;
-#if !defined (_ANYSEQ___VAR_CH_)
-#define _ANYSEQ___VAR_CH_
-
// *************************************************************
// class AnySeq_var
// *************************************************************
@@ -1502,13 +1309,6 @@ private:
AnySeq *ptr_;
};
-
-#endif /* end #if !defined */
-
-
-#if !defined (_ANYSEQ___OUT_CH_)
-#define _ANYSEQ___OUT_CH_
-
class AnySeq_out
{
public:
@@ -1528,12 +1328,6 @@ private:
void operator= (const AnySeq_var &);
};
-
-#endif /* end #if !defined */
-
-#if !defined (_ANYSEQ_CH_)
-#define _ANYSEQ_CH_
-
// *************************************************************
// AnySeq
// *************************************************************
@@ -1565,24 +1359,11 @@ public:
};
-#endif /* end #if !defined */
-
-
extern CORBA::TypeCode_ptr _tc_AnySeq;
-
-#if !defined (_CORBA_DYNSEQUENCE___PTR_CH_)
-#define _CORBA_DYNSEQUENCE___PTR_CH_
-
class CORBA_DynSequence;
typedef CORBA_DynSequence *CORBA_DynSequence_ptr;
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DYNSEQUENCE___VAR_CH_)
-#define _CORBA_DYNSEQUENCE___VAR_CH_
-
class CORBA_DynSequence_var
{
public:
@@ -1608,13 +1389,6 @@ private:
CORBA_DynSequence_ptr ptr_;
};
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DYNSEQUENCE___OUT_CH_)
-#define _CORBA_DYNSEQUENCE___OUT_CH_
-
class CORBA_DynSequence_out
{
public:
@@ -1632,13 +1406,6 @@ private:
CORBA_DynSequence_ptr &ptr_;
};
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DYNSEQUENCE_CH_)
-#define _CORBA_DYNSEQUENCE_CH_
-
class TAO_Export CORBA_DynSequence: public virtual CORBA_DynAny
{
public:
@@ -1692,24 +1459,11 @@ private:
void operator= (const CORBA_DynSequence &);
};
-
-#endif /* end #if !defined */
-
extern CORBA::TypeCode_ptr _tc_CORBA_DynSequence;
-
-#if !defined (_CORBA_DYNARRAY___PTR_CH_)
-#define _CORBA_DYNARRAY___PTR_CH_
-
class CORBA_DynArray;
typedef CORBA_DynArray *CORBA_DynArray_ptr;
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DYNARRAY___VAR_CH_)
-#define _CORBA_DYNARRAY___VAR_CH_
-
class CORBA_DynArray_var
{
public:
@@ -1735,13 +1489,6 @@ private:
CORBA_DynArray_ptr ptr_;
};
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DYNARRAY___OUT_CH_)
-#define _CORBA_DYNARRAY___OUT_CH_
-
class CORBA_DynArray_out
{
public:
@@ -1759,13 +1506,6 @@ private:
CORBA_DynArray_ptr &ptr_;
};
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DYNARRAY_CH_)
-#define _CORBA_DYNARRAY_CH_
-
class TAO_Export CORBA_DynArray: public virtual CORBA_DynAny
{
public:
@@ -1810,9 +1550,6 @@ private:
void operator= (const CORBA_DynArray &);
};
-
-#endif /* end #if !defined */
-
extern CORBA::TypeCode_ptr _tc_CORBA_DynArray;
#if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile
index f464b75d078..f6b1fe3e0d7 100644
--- a/TAO/tao/Makefile
+++ b/TAO/tao/Makefile
@@ -70,7 +70,6 @@ ORB_CORE_FILES = \
Any \
CurrentC \
CurrentS \
- Context \
Exception \
Environment \
Object \
@@ -117,6 +116,7 @@ POA_FILES += \
Forwarding_Servant
ORB_CORE_FILES += \
+ Context \
Request \
NVList
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 7a0c1a38f2e..809d9fdf298 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -323,6 +323,81 @@ CORBA_ORB::work_pending (void)
return 1;
}
+// The following functions are not implemented - they just throw
+// CORBA::NO_IMPLEMENT.
+
+void
+CORBA_ORB::create_exception_list (CORBA::ExceptionList_ptr &,
+ CORBA_Environment &ACE_TRY_ENV)
+{
+ ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
+ CORBA::COMPLETED_NO));
+}
+
+void
+CORBA_ORB::create_environment (CORBA::Environment_ptr &,
+ CORBA_Environment &ACE_TRY_ENV)
+{
+ ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
+ CORBA::COMPLETED_NO));
+}
+
+void
+CORBA_ORB::create_named_value (CORBA::NamedValue_ptr &,
+ CORBA_Environment &ACE_TRY_ENV)
+{
+ ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
+ CORBA::COMPLETED_NO));
+}
+
+void
+CORBA_ORB::create_context_list (CORBA::ContextList_ptr &,
+ CORBA_Environment &ACE_TRY_ENV)
+{
+ ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
+ CORBA::COMPLETED_NO));
+}
+
+void
+CORBA_ORB::get_default_context (CORBA::Context_ptr &,
+ CORBA_Environment &ACE_TRY_ENV)
+{
+ ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
+ CORBA::COMPLETED_NO));
+}
+
+void
+CORBA_ORB::send_multiple_requests_oneway (const CORBA_ORB_RequestSeq,
+ CORBA_Environment &ACE_TRY_ENV)
+{
+ ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
+ CORBA::COMPLETED_NO));
+}
+
+void
+CORBA_ORB::send_multiple_requests_deferred (const CORBA_ORB_RequestSeq,
+ CORBA_Environment &ACE_TRY_ENV)
+{
+ ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
+ CORBA::COMPLETED_NO));
+}
+
+void
+CORBA_ORB::get_next_response (CORBA_Request_ptr &,
+ CORBA_Environment &ACE_TRY_ENV)
+{
+ ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
+ CORBA::COMPLETED_NO));
+}
+
+CORBA::Boolean
+CORBA_ORB::poll_next_response (CORBA_Environment &ACE_TRY_ENV)
+{
+ ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
+ CORBA::COMPLETED_NO),
+ 0);
+}
+
#endif /* TAO_HAS_MINIMUM_CORBA */
int
@@ -1722,81 +1797,6 @@ CORBA_ORB::_tao_find_in_IOR_table (ACE_CString &object_id,
return 0;
}
-// The following functions are not implemented - they just throw
-// CORBA::NO_IMPLEMENT.
-
-void
-CORBA_ORB::create_named_value (CORBA::NamedValue_ptr &,
- CORBA_Environment &ACE_TRY_ENV)
-{
- ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
- CORBA::COMPLETED_NO));
-}
-
-void
-CORBA_ORB::create_exception_list (CORBA::ExceptionList_ptr &,
- CORBA_Environment &ACE_TRY_ENV)
-{
- ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
- CORBA::COMPLETED_NO));
-}
-
-void
-CORBA_ORB::create_context_list (CORBA::ContextList_ptr &,
- CORBA_Environment &ACE_TRY_ENV)
-{
- ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
- CORBA::COMPLETED_NO));
-}
-
-void
-CORBA_ORB::get_default_context (CORBA::Context_ptr &,
- CORBA_Environment &ACE_TRY_ENV)
-{
- ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
- CORBA::COMPLETED_NO));
-}
-
-void
-CORBA_ORB::create_environment (CORBA::Environment_ptr &,
- CORBA_Environment &ACE_TRY_ENV)
-{
- ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
- CORBA::COMPLETED_NO));
-}
-
-void
-CORBA_ORB::send_multiple_requests_oneway (const CORBA_ORB_RequestSeq,
- CORBA_Environment &ACE_TRY_ENV)
-{
- ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
- CORBA::COMPLETED_NO));
-}
-
-void
-CORBA_ORB::send_multiple_requests_deferred (const CORBA_ORB_RequestSeq,
- CORBA_Environment &ACE_TRY_ENV)
-{
- ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
- CORBA::COMPLETED_NO));
-}
-
-void
-CORBA_ORB::get_next_response (CORBA_Request_ptr &,
- CORBA_Environment &ACE_TRY_ENV)
-{
- ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
- CORBA::COMPLETED_NO));
-}
-
-CORBA::Boolean
-CORBA_ORB::poll_next_response (CORBA_Environment &ACE_TRY_ENV)
-{
- ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
- CORBA::COMPLETED_NO),
- 0);
-}
-
// ****************************************************************
CORBA::ORB_ptr
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index f8147d8500d..d0f17d36899 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -228,14 +228,6 @@ public:
virtual int _is_a (const char* interface_id) const;
};
- // Typedefs for CORBA_ORB_RequestSeq,
- // which is an argument of send_multiple_requests_*().
- // See Request.{h,i,cpp} for definitions.
- typedef CORBA_ORB_RequestSeq RequestSeq;
- typedef CORBA_ORB_RequestSeq_ptr RequestSeq_ptr;
- typedef CORBA_ORB_RequestSeq_var RequestSeq_var;
- typedef CORBA_ORB_RequestSeq_out RequestSeq_out;
-
typedef char *ObjectId;
typedef CORBA::String_var ObjectId_var;
typedef CORBA::String_out ObjectId_out;
@@ -283,6 +275,14 @@ public:
#if !defined (TAO_HAS_MINIMUM_CORBA)
+ // Typedefs for CORBA_ORB_RequestSeq,
+ // which is an argument of send_multiple_requests_*().
+ // See Request.{h,i,cpp} for definitions.
+ typedef CORBA_ORB_RequestSeq RequestSeq;
+ typedef CORBA_ORB_RequestSeq_ptr RequestSeq_ptr;
+ typedef CORBA_ORB_RequestSeq_var RequestSeq_var;
+ typedef CORBA_ORB_RequestSeq_out RequestSeq_out;
+
void create_list (CORBA::Long count,
CORBA::NVList_ptr &new_list,
CORBA_Environment &ACE_TRY_ENV =
diff --git a/TAO/tao/Object_Adapter.cpp b/TAO/tao/Object_Adapter.cpp
index 8aba3a10d3e..d3d6f972b65 100644
--- a/TAO/tao/Object_Adapter.cpp
+++ b/TAO/tao/Object_Adapter.cpp
@@ -849,18 +849,22 @@ TAO_Object_Adapter::Single_Threaded_POA_Lock::Single_Threaded_POA_Lock (TAO_POA
: poa_ (poa),
servant_ (servant)
{
+#if !defined (TAO_HAS_MINIMUM_CORBA)
if (this->poa_.policies ().thread () == PortableServer::SINGLE_THREAD_MODEL)
{
this->servant_->_single_threaded_poa_lock ().acquire ();
}
+#endif /* TAO_HAS_MINIMUM_CORBA */
}
TAO_Object_Adapter::Single_Threaded_POA_Lock::~Single_Threaded_POA_Lock (void)
{
+#if !defined (TAO_HAS_MINIMUM_CORBA)
if (this->poa_.policies ().thread () == PortableServer::SINGLE_THREAD_MODEL)
{
this->servant_->_single_threaded_poa_lock ().release ();
}
+#endif /* TAO_HAS_MINIMUM_CORBA */
}
////////////////////////////////////////////////////////////////////////////////
diff --git a/TAO/tao/POA.i b/TAO/tao/POA.i
index 5850ef1dee3..144f32c3de4 100644
--- a/TAO/tao/POA.i
+++ b/TAO/tao/POA.i
@@ -623,19 +623,23 @@ TAO_POA::decrement_outstanding_requests (void)
ACE_INLINE void
TAO_POA::establish_servant_lock (PortableServer::Servant servant)
{
+#if !defined (TAO_HAS_MINIMUM_CORBA)
if (this->policies ().thread () == PortableServer::SINGLE_THREAD_MODEL)
{
servant->_increment_single_threaded_poa_lock_count ();
}
+#endif /* TAO_HAS_MINIMUM_CORBA */
}
ACE_INLINE void
TAO_POA::teardown_servant_lock (PortableServer::Servant servant)
{
+#if !defined (TAO_HAS_MINIMUM_CORBA)
if (this->policies ().thread () == PortableServer::SINGLE_THREAD_MODEL)
{
servant->_decrement_single_threaded_poa_lock_count ();
}
+#endif /* TAO_HAS_MINIMUM_CORBA */
}
ACE_INLINE void
diff --git a/TAO/tao/POAC.i b/TAO/tao/POAC.i
index 5b6a45ee813..e5797af0bd8 100644
--- a/TAO/tao/POAC.i
+++ b/TAO/tao/POAC.i
@@ -3103,6 +3103,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::Thread
return 0;
}
+#if !defined (TAO_HAS_MINIMUM_CORBA)
ACE_INLINE CORBA::Boolean
operator<< (
TAO_OutputCDR &,
@@ -3151,6 +3152,7 @@ operator>> (
ACE_ENDTRY;
return 0;
}
+#endif /* end #if !defined */
ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::LifespanPolicyValue &_tao_enumval)
{
@@ -3367,6 +3369,8 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::Implic
return 0;
}
+#if !defined (TAO_HAS_MINIMUM_CORBA)
+
ACE_INLINE CORBA::Boolean
operator<< (
TAO_OutputCDR &,
@@ -3415,6 +3419,8 @@ operator>> (
ACE_ENDTRY;
return 0;
}
+#endif /* !defined (TAO_HAS_MINIMUM_CORBA) */
+
ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ServantRetentionPolicyValue &_tao_enumval)
{
@@ -3433,6 +3439,8 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::Servan
return 0;
}
+#if !defined (TAO_HAS_MINIMUM_CORBA)
+
ACE_INLINE CORBA::Boolean
operator<< (
TAO_OutputCDR &,
@@ -3482,6 +3490,8 @@ operator>> (
return 0;
}
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::RequestProcessingPolicyValue &_tao_enumval)
{
return strm.write_ulong ((CORBA::ULong) _tao_enumval);
@@ -3499,6 +3509,8 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::Reques
return 0;
}
+#if !defined(TAO_HAS_MINIMUM_CORBA)
+
ACE_INLINE CORBA::Boolean
operator<< (
TAO_OutputCDR &,
@@ -3547,6 +3559,7 @@ operator>> (
ACE_ENDTRY;
return 0;
}
+#endif /* TAO_HAS_MINIMUM_CORBA */
ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::AdapterAlreadyExists &_tao_aggregate)
@@ -3571,6 +3584,8 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::A
return 0;
}
+#if !defined (TAO_HAS_MINIMUM_CORBA)
+
ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::AdapterInactive &_tao_aggregate)
{
// first marshal the repository ID
@@ -3592,6 +3607,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::A
else
return 0;
}
+#endif /* TAO_HAS_MINIMUM_CORBA */
ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::AdapterNonExistent &_tao_aggregate)
{
@@ -3651,6 +3667,8 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::I
return 0;
}
+#if !defined (TAO_HAS_MINIMUM_CORBA)
+
ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::NoServant &_tao_aggregate)
{
// first marshal the repository ID
@@ -3672,6 +3690,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::N
else
return 0;
}
+#endif /* !defined (TAO_HAS_MINIMUM_CORBA) */
ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::ObjectAlreadyActive &_tao_aggregate)
{
diff --git a/TAO/tao/Typecode_Constants.cpp b/TAO/tao/Typecode_Constants.cpp
index 93a79e7ce63..dcea95cf2bd 100644
--- a/TAO/tao/Typecode_Constants.cpp
+++ b/TAO/tao/Typecode_Constants.cpp
@@ -78,8 +78,8 @@ CORBA::TypeCode_ptr CORBA::_tc_Object = 0;
// Two typecodes for exceptions
CORBA::TypeCode_ptr CORBA::TypeCode::_tc_Bounds = 0;
CORBA::TypeCode_ptr CORBA::TypeCode::_tc_BadKind = 0;
-// Some more typecodes in the CORBA namespace. We keep adding
-// to this list as we find more and more things being introduced
+// Some more typecodes in the CORBA namespace. We keep adding
+// to this list as we find more and more things being introduced
// to the CORBA namespace.
CORBA::TypeCode_ptr CORBA::_tc_Current = 0;
@@ -87,7 +87,9 @@ CORBA::TypeCode_ptr CORBA::_tc_Identifier = 0;
CORBA::TypeCode_ptr CORBA::_tc_RepositoryId = 0;
CORBA::TypeCode_ptr CORBA::_tc_ORBid = 0;
CORBA::TypeCode_ptr CORBA_ORB::_tc_ObjectId = 0;
+#if !defined(TAO_HAS_MINIMUM_CORBA)
CORBA::TypeCode_ptr CORBA_ORB::_tc_InconsistentTypeCode = 0;
+#endif /* TAO_HAS_MINIMUM_CORBA */
CORBA::TypeCode_ptr CORBA::_tc_PolicyErrorCode = 0;
CORBA::TypeCode_ptr CORBA::_tc_PolicyError = 0;
@@ -109,7 +111,7 @@ CORBA::TypeCode_ptr TC_opaque = 0;
CORBA::TypeCode_ptr TC_ServiceContextList = 0;
CORBA::TypeCode_ptr TC_completion_status = 0;
-// initialize all the ORB owned TypeCode constants. This
+// initialize all the ORB owned TypeCode constants. This
// routine will be invoked by the ORB_init method.
void
TAO_TypeCodes::init (void)
@@ -235,7 +237,7 @@ TAO_TypeCodes::init (void)
0, 0, 0, 0 // no members to this typecode
};
- CORBA::TypeCode::_tc_Bounds =
+ CORBA::TypeCode::_tc_Bounds =
new CORBA::TypeCode (CORBA::tk_except,
sizeof tc_buf_Bounds,
tc_buf_Bounds,
@@ -259,7 +261,7 @@ TAO_TypeCodes::init (void)
0, 0, 0, 0 // no members to this typecode
};
- CORBA::TypeCode::_tc_BadKind =
+ CORBA::TypeCode::_tc_BadKind =
new CORBA::TypeCode (CORBA::tk_except,
sizeof tc_buf_BadKind,
tc_buf_BadKind,
@@ -269,23 +271,23 @@ TAO_TypeCodes::init (void)
static const CORBA::Long _oc_CORBA_Identifier[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
- 25,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f4964),
- ACE_NTOHL (0x656e7469),
- ACE_NTOHL (0x66696572),
- ACE_NTOHL (0x3a312e30),
+ 25,
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f4964),
+ ACE_NTOHL (0x656e7469),
+ ACE_NTOHL (0x66696572),
+ ACE_NTOHL (0x3a312e30),
ACE_NTOHL (0xfdfdfd), // repository ID = IDL:CORBA/Identifier:1.0
- 11,
- ACE_NTOHL (0x4964656e),
- ACE_NTOHL (0x74696669),
+ 11,
+ ACE_NTOHL (0x4964656e),
+ ACE_NTOHL (0x74696669),
ACE_NTOHL (0x657200fd), // name = Identifier
CORBA::tk_string,
0, // string length
};
- CORBA::_tc_Identifier =
+ CORBA::_tc_Identifier =
new CORBA::TypeCode (CORBA::tk_alias,
sizeof (_oc_CORBA_Identifier),
(char *) &_oc_CORBA_Identifier,
@@ -295,23 +297,23 @@ TAO_TypeCodes::init (void)
static const CORBA::Long _oc_CORBA_RepositoryId[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
- 27,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f5265),
- ACE_NTOHL (0x706f7369),
- ACE_NTOHL (0x746f7279),
- ACE_NTOHL (0x49643a31),
+ 27,
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f5265),
+ ACE_NTOHL (0x706f7369),
+ ACE_NTOHL (0x746f7279),
+ ACE_NTOHL (0x49643a31),
ACE_NTOHL (0x2e3000fd), // repository ID = IDL:CORBA/RepositoryId:1.0
- 13,
- ACE_NTOHL (0x5265706f),
- ACE_NTOHL (0x7369746f),
- ACE_NTOHL (0x72794964),
+ 13,
+ ACE_NTOHL (0x5265706f),
+ ACE_NTOHL (0x7369746f),
+ ACE_NTOHL (0x72794964),
ACE_NTOHL (0xfdfdfd), // name = RepositoryId
CORBA::tk_string,
0, // string length
};
- CORBA::_tc_RepositoryId =
+ CORBA::_tc_RepositoryId =
new CORBA::TypeCode (CORBA::tk_alias,
sizeof (_oc_CORBA_RepositoryId),
(char *) &_oc_CORBA_RepositoryId,
@@ -321,17 +323,17 @@ TAO_TypeCodes::init (void)
static const CORBA::Long _oc_CORBA_ORBid[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
- 28, ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f4f52),
- ACE_NTOHL (0x4269643a),
+ 28, ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f4f52),
+ ACE_NTOHL (0x4269643a),
ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/ORBid:1.0
- 6,
- ACE_NTOHL (0x4f524269),
+ 6,
+ ACE_NTOHL (0x4f524269),
ACE_NTOHL (0x64000000), // name = ORBid
- CORBA::tk_string,
+ CORBA::tk_string,
0, // string length
};
CORBA::_tc_ORBid = new CORBA::TypeCode (CORBA::tk_alias,
@@ -343,29 +345,30 @@ TAO_TypeCodes::init (void)
static const CORBA::Long _oc_CORBA_ObjectId[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
- 31,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f4f62),
- ACE_NTOHL (0x6a656374),
- ACE_NTOHL (0x49643a31),
+ 31,
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f4f62),
+ ACE_NTOHL (0x6a656374),
+ ACE_NTOHL (0x49643a31),
ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/ObjectId:1.0
- 9,
- ACE_NTOHL (0x4f626a65),
- ACE_NTOHL (0x63744964),
+ 9,
+ ACE_NTOHL (0x4f626a65),
+ ACE_NTOHL (0x63744964),
ACE_NTOHL (0x0), // name = ObjectId
- CORBA::tk_string,
+ CORBA::tk_string,
0, // string length
};
- CORBA_ORB::_tc_ObjectId =
+ CORBA_ORB::_tc_ObjectId =
new CORBA::TypeCode (CORBA::tk_alias,
sizeof (_oc_CORBA_ObjectId),
(char *) &_oc_CORBA_ObjectId,
0,
sizeof (CORBA_ORB::ObjectId));
+#if !defined(TAO_HAS_MINIMUM_CORBA)
static const CORBA::Long _oc_CORBA_ORB_InconsistentTypeCode[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -399,28 +402,29 @@ TAO_TypeCodes::init (void)
(char *) &_oc_CORBA_ORB_InconsistentTypeCode,
0,
sizeof (CORBA_ORB_InconsistentTypeCode));
+#endif /* TAO_HAS_MINIMUM_CORBA */
// ****************************************************************
static const CORBA::Long _oc_CORBA_PolicyErrorCode[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
- 38,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f506f),
- ACE_NTOHL (0x6c696379),
- ACE_NTOHL (0x4572726f),
- ACE_NTOHL (0x72436f64),
- ACE_NTOHL (0x653a312e),
- ACE_NTOHL (0x30000000), // repository ID =
+ 38,
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f506f),
+ ACE_NTOHL (0x6c696379),
+ ACE_NTOHL (0x4572726f),
+ ACE_NTOHL (0x72436f64),
+ ACE_NTOHL (0x653a312e),
+ ACE_NTOHL (0x30000000), // repository ID =
// IDL:omg.org/CORBA/PolicyErrorCode:1.0
- 16,
- ACE_NTOHL (0x506f6c69),
- ACE_NTOHL (0x63794572),
- ACE_NTOHL (0x726f7243),
+ 16,
+ ACE_NTOHL (0x506f6c69),
+ ACE_NTOHL (0x63794572),
+ ACE_NTOHL (0x726f7243),
ACE_NTOHL (0x6f646500), // name = PolicyErrorCode
CORBA::tk_short,
};
@@ -434,45 +438,45 @@ TAO_TypeCodes::init (void)
static const CORBA::Long _oc_CORBA_PolicyError[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
- 34,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f506f),
- ACE_NTOHL (0x6c696379),
- ACE_NTOHL (0x4572726f),
- ACE_NTOHL (0x723a312e),
- ACE_NTOHL (0x30000000), // repository ID =
+ 34,
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f506f),
+ ACE_NTOHL (0x6c696379),
+ ACE_NTOHL (0x4572726f),
+ ACE_NTOHL (0x723a312e),
+ ACE_NTOHL (0x30000000), // repository ID =
// IDL:omg.org/CORBA/PolicyError:1.0
- 12,
- ACE_NTOHL (0x506f6c69),
-
- ACE_NTOHL (0x63794572),
+ 12,
+ ACE_NTOHL (0x506f6c69),
+
+ ACE_NTOHL (0x63794572),
ACE_NTOHL (0x726f7200), // name = PolicyError
1, // member count
- 7,
- ACE_NTOHL (0x72656173),
+ 7,
+ ACE_NTOHL (0x72656173),
ACE_NTOHL (0x6f6e0000), // name = reason
CORBA::tk_alias, // typecode kind for typedefs
72, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
- 38,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f506f),
- ACE_NTOHL (0x6c696379),
- ACE_NTOHL (0x4572726f),
- ACE_NTOHL (0x72436f64),
- ACE_NTOHL (0x653a312e),
- ACE_NTOHL (0x30000000), // repository ID =
+ 38,
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f506f),
+ ACE_NTOHL (0x6c696379),
+ ACE_NTOHL (0x4572726f),
+ ACE_NTOHL (0x72436f64),
+ ACE_NTOHL (0x653a312e),
+ ACE_NTOHL (0x30000000), // repository ID =
// IDL:omg.org/CORBA/PolicyErrorCode:1.0
- 16,
- ACE_NTOHL (0x506f6c69),
- ACE_NTOHL (0x63794572),
- ACE_NTOHL (0x726f7243),
+ 16,
+ ACE_NTOHL (0x506f6c69),
+ ACE_NTOHL (0x63794572),
+ ACE_NTOHL (0x726f7243),
ACE_NTOHL (0x6f646500), // name = PolicyErrorCode
CORBA::tk_short,
};
@@ -486,25 +490,25 @@ TAO_TypeCodes::init (void)
static const CORBA::Long _oc_CORBA_InvalidPolicies[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
- 38,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f496e),
- ACE_NTOHL (0x76616c69),
- ACE_NTOHL (0x64506f6c),
- ACE_NTOHL (0x69636965),
- ACE_NTOHL (0x733a312e),
+ 38,
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f496e),
+ ACE_NTOHL (0x76616c69),
+ ACE_NTOHL (0x64506f6c),
+ ACE_NTOHL (0x69636965),
+ ACE_NTOHL (0x733a312e),
ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CORBA/InvalidPolicies:1.0
- 16,
- ACE_NTOHL (0x496e7661),
- ACE_NTOHL (0x6c696450),
- ACE_NTOHL (0x6f6c6963),
+ 16,
+ ACE_NTOHL (0x496e7661),
+ ACE_NTOHL (0x6c696450),
+ ACE_NTOHL (0x6f6c6963),
ACE_NTOHL (0x69657300), // name = InvalidPolicies
1, // member count
- 8,
- ACE_NTOHL (0x696e6469),
+ 8,
+ ACE_NTOHL (0x696e6469),
ACE_NTOHL (0x63657300), // name = indices
CORBA::tk_sequence, // typecode kind
12, // encapsulation length
@@ -522,20 +526,20 @@ TAO_TypeCodes::init (void)
static const CORBA::Long _oc_CORBA_PolicyType[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
- 33,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f506f),
- ACE_NTOHL (0x6c696379),
- ACE_NTOHL (0x54797065),
- ACE_NTOHL (0x3a312e30),
- ACE_NTOHL (0x0), // repository ID =
+ 33,
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f506f),
+ ACE_NTOHL (0x6c696379),
+ ACE_NTOHL (0x54797065),
+ ACE_NTOHL (0x3a312e30),
+ ACE_NTOHL (0x0), // repository ID =
// IDL:omg.org/CORBA/PolicyType:1.0
- 11,
- ACE_NTOHL (0x506f6c69),
- ACE_NTOHL (0x63795479),
+ 11,
+ ACE_NTOHL (0x506f6c69),
+ ACE_NTOHL (0x63795479),
ACE_NTOHL (0x70650000), // name = PolicyType
CORBA::tk_ulong,
};
@@ -549,17 +553,17 @@ TAO_TypeCodes::init (void)
static const CORBA::Long _oc_CORBA_Policy[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
- 29,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f506f),
- ACE_NTOHL (0x6c696379),
- ACE_NTOHL (0x3a312e30),
+ 29,
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f506f),
+ ACE_NTOHL (0x6c696379),
+ ACE_NTOHL (0x3a312e30),
ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Policy:1.0
- 7,
- ACE_NTOHL (0x506f6c69),
+ 7,
+ ACE_NTOHL (0x506f6c69),
ACE_NTOHL (0x63790000), // name = Policy,
};
CORBA::_tc_Policy =
@@ -572,20 +576,20 @@ TAO_TypeCodes::init (void)
static const CORBA::Long _oc_CORBA_PolicyList[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
- 33,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f506f),
- ACE_NTOHL (0x6c696379),
- ACE_NTOHL (0x4c697374),
- ACE_NTOHL (0x3a312e30),
- ACE_NTOHL (0x0), // repository ID =
+ 33,
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f506f),
+ ACE_NTOHL (0x6c696379),
+ ACE_NTOHL (0x4c697374),
+ ACE_NTOHL (0x3a312e30),
+ ACE_NTOHL (0x0), // repository ID =
// IDL:omg.org/CORBA/PolicyList:1.0
- 11,
- ACE_NTOHL (0x506f6c69),
- ACE_NTOHL (0x63794c69),
+ 11,
+ ACE_NTOHL (0x506f6c69),
+ ACE_NTOHL (0x63794c69),
ACE_NTOHL (0x73740000), // name = PolicyList
CORBA::tk_sequence, // typecode kind
68, // encapsulation length
@@ -593,18 +597,18 @@ TAO_TypeCodes::init (void)
CORBA::tk_objref, // typecode kind
52, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
- 29,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f506f),
- ACE_NTOHL (0x6c696379),
- ACE_NTOHL (0x3a312e30),
- ACE_NTOHL (0x0), // repository ID =
+ 29,
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f506f),
+ ACE_NTOHL (0x6c696379),
+ ACE_NTOHL (0x3a312e30),
+ ACE_NTOHL (0x0), // repository ID =
// IDL:omg.org/CORBA/Policy:1.0
- 7,
- ACE_NTOHL (0x506f6c69),
+ 7,
+ ACE_NTOHL (0x506f6c69),
ACE_NTOHL (0x63790000), // name = Policy,
0,
};
@@ -618,21 +622,21 @@ TAO_TypeCodes::init (void)
static const CORBA::Long _oc_CORBA_PolicyTypeSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
- 36,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f506f),
- ACE_NTOHL (0x6c696379),
- ACE_NTOHL (0x54797065),
- ACE_NTOHL (0x5365713a),
- ACE_NTOHL (0x312e3000), // repository ID =
+ 36,
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f506f),
+ ACE_NTOHL (0x6c696379),
+ ACE_NTOHL (0x54797065),
+ ACE_NTOHL (0x5365713a),
+ ACE_NTOHL (0x312e3000), // repository ID =
// IDL:omg.org/CORBA/PolicyTypeSeq:1.0
- 14,
- ACE_NTOHL (0x506f6c69),
- ACE_NTOHL (0x63795479),
- ACE_NTOHL (0x70655365),
+ 14,
+ ACE_NTOHL (0x506f6c69),
+ ACE_NTOHL (0x63795479),
+ ACE_NTOHL (0x70655365),
ACE_NTOHL (0x71000000), // name = PolicyTypeSeq
CORBA::tk_sequence, // typecode kind
80, // encapsulation length
@@ -640,20 +644,20 @@ TAO_TypeCodes::init (void)
CORBA::tk_alias, // typecode kind for typedefs
64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
- 33,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
+ 33,
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f506f),
- ACE_NTOHL (0x6c696379),
- ACE_NTOHL (0x54797065),
- ACE_NTOHL (0x3a312e30),
- ACE_NTOHL (0x0), // repository ID =
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f506f),
+ ACE_NTOHL (0x6c696379),
+ ACE_NTOHL (0x54797065),
+ ACE_NTOHL (0x3a312e30),
+ ACE_NTOHL (0x0), // repository ID =
// IDL:omg.org/CORBA/PolicyType:1.0
- 11,
- ACE_NTOHL (0x506f6c69),
- ACE_NTOHL (0x63795479),
+ 11,
+ ACE_NTOHL (0x506f6c69),
+ ACE_NTOHL (0x63795479),
ACE_NTOHL (0x70650000), // name = PolicyType
CORBA::tk_ulong,
0,
@@ -668,33 +672,33 @@ TAO_TypeCodes::init (void)
static const CORBA::Long _oc_CORBA_SetOverrideType[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
- 38,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f5365),
- ACE_NTOHL (0x744f7665),
- ACE_NTOHL (0x72726964),
- ACE_NTOHL (0x65547970),
- ACE_NTOHL (0x653a312e),
- ACE_NTOHL (0x30000000), // repository ID =
+ 38,
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f5365),
+ ACE_NTOHL (0x744f7665),
+ ACE_NTOHL (0x72726964),
+ ACE_NTOHL (0x65547970),
+ ACE_NTOHL (0x653a312e),
+ ACE_NTOHL (0x30000000), // repository ID =
// IDL:omg.org/CORBA/SetOverrideType:1.0
- 16,
- ACE_NTOHL (0x5365744f),
- ACE_NTOHL (0x76657272),
- ACE_NTOHL (0x69646554),
+ 16,
+ ACE_NTOHL (0x5365744f),
+ ACE_NTOHL (0x76657272),
+ ACE_NTOHL (0x69646554),
ACE_NTOHL (0x79706500), // name = SetOverrideType
2, // member count
- 13,
- ACE_NTOHL (0x5345545f),
- ACE_NTOHL (0x4f564552),
- ACE_NTOHL (0x52494445),
+ 13,
+ ACE_NTOHL (0x5345545f),
+ ACE_NTOHL (0x4f564552),
+ ACE_NTOHL (0x52494445),
ACE_NTOHL (0x0), // name = SET_OVERRIDE
- 13,
- ACE_NTOHL (0x4144445f),
+ 13,
+ ACE_NTOHL (0x4144445f),
ACE_NTOHL (0x4f564552),
- ACE_NTOHL (0x52494445),
+ ACE_NTOHL (0x52494445),
ACE_NTOHL (0x0), // name = ADD_OVERRIDE
};
CORBA::_tc_SetOverrideType =
@@ -707,21 +711,21 @@ TAO_TypeCodes::init (void)
static const CORBA::Long _oc_CORBA_PolicyManager[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
- 36,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f506f),
- ACE_NTOHL (0x6c696379),
- ACE_NTOHL (0x4d616e61),
- ACE_NTOHL (0x6765723a),
- ACE_NTOHL (0x312e3000), // repository ID =
+ 36,
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f506f),
+ ACE_NTOHL (0x6c696379),
+ ACE_NTOHL (0x4d616e61),
+ ACE_NTOHL (0x6765723a),
+ ACE_NTOHL (0x312e3000), // repository ID =
// IDL:omg.org/CORBA/PolicyManager:1.0
- 14,
- ACE_NTOHL (0x506f6c69),
- ACE_NTOHL (0x63794d61),
- ACE_NTOHL (0x6e616765),
+ 14,
+ ACE_NTOHL (0x506f6c69),
+ ACE_NTOHL (0x63794d61),
+ ACE_NTOHL (0x6e616765),
ACE_NTOHL (0x72000000), // name = PolicyManager,
};
CORBA::_tc_PolicyManager =
@@ -734,21 +738,21 @@ TAO_TypeCodes::init (void)
static const CORBA::Long _oc_CORBA_PolicyCurrent[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
- 36,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f506f),
- ACE_NTOHL (0x6c696379),
- ACE_NTOHL (0x43757272),
- ACE_NTOHL (0x656e743a),
- ACE_NTOHL (0x312e3000), // repository ID =
+ 36,
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f506f),
+ ACE_NTOHL (0x6c696379),
+ ACE_NTOHL (0x43757272),
+ ACE_NTOHL (0x656e743a),
+ ACE_NTOHL (0x312e3000), // repository ID =
// IDL:omg.org/CORBA/PolicyCurrent:1.0
- 14,
- ACE_NTOHL (0x506f6c69),
- ACE_NTOHL (0x63794375),
- ACE_NTOHL (0x7272656e),
+ 14,
+ ACE_NTOHL (0x506f6c69),
+ ACE_NTOHL (0x63794375),
+ ACE_NTOHL (0x7272656e),
ACE_NTOHL (0x74000000), // name = PolicyCurrent,
};
CORBA::_tc_PolicyCurrent =
@@ -764,19 +768,19 @@ TAO_TypeCodes::init (void)
static const CORBA::Long _oc_CORBA_Pollable[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
- 31,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f506f),
- ACE_NTOHL (0x6c6c6162),
- ACE_NTOHL (0x6c653a31),
- ACE_NTOHL (0x2e300000), // repository ID =
+ 31,
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f506f),
+ ACE_NTOHL (0x6c6c6162),
+ ACE_NTOHL (0x6c653a31),
+ ACE_NTOHL (0x2e300000), // repository ID =
// IDL:omg.org/CORBA/Pollable:1.0
- 9,
- ACE_NTOHL (0x506f6c6c),
- ACE_NTOHL (0x61626c65),
+ 9,
+ ACE_NTOHL (0x506f6c6c),
+ ACE_NTOHL (0x61626c65),
ACE_NTOHL (0x0), // name = Pollable,
};
CORBA::_tc_Pollable =
@@ -789,20 +793,20 @@ TAO_TypeCodes::init (void)
static const CORBA::Long _oc_CORBA_DIIPollable[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
- 34,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f4449),
- ACE_NTOHL (0x49506f6c),
- ACE_NTOHL (0x6c61626c),
- ACE_NTOHL (0x653a312e),
- ACE_NTOHL (0x30000000), // repository ID =
+ 34,
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f4449),
+ ACE_NTOHL (0x49506f6c),
+ ACE_NTOHL (0x6c61626c),
+ ACE_NTOHL (0x653a312e),
+ ACE_NTOHL (0x30000000), // repository ID =
// IDL:omg.org/CORBA/DIIPollable:1.0
- 12,
- ACE_NTOHL (0x44494950),
- ACE_NTOHL (0x6f6c6c61),
+ 12,
+ ACE_NTOHL (0x44494950),
+ ACE_NTOHL (0x6f6c6c61),
ACE_NTOHL (0x626c6500), // name = DIIPollable,
};
CORBA::_tc_DIIPollable =
@@ -815,27 +819,27 @@ TAO_TypeCodes::init (void)
static const CORBA::Long _oc_CORBA_PollableSet[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
- 34,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f506f),
- ACE_NTOHL (0x6c6c6162),
- ACE_NTOHL (0x6c655365),
- ACE_NTOHL (0x743a312e),
- ACE_NTOHL (0x30000000), // repository ID =
+ 34,
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f506f),
+ ACE_NTOHL (0x6c6c6162),
+ ACE_NTOHL (0x6c655365),
+ ACE_NTOHL (0x743a312e),
+ ACE_NTOHL (0x30000000), // repository ID =
// IDL:omg.org/CORBA/PollableSet:1.0
- 12,
- ACE_NTOHL (0x506f6c6c),
- ACE_NTOHL (0x61626c65),
+ 12,
+ ACE_NTOHL (0x506f6c6c),
+ ACE_NTOHL (0x61626c65),
ACE_NTOHL (0x53657400), // name = PollableSet,
};
CORBA::_tc_PollableSet =
- new CORBA::TypeCode (CORBA::tk_objref,
- sizeof (_oc_CORBA_PollableSet),
- (char *) &_oc_CORBA_PollableSet,
- 0,
+ new CORBA::TypeCode (CORBA::tk_objref,
+ sizeof (_oc_CORBA_PollableSet),
+ (char *) &_oc_CORBA_PollableSet,
+ 0,
sizeof (CORBA_PollableSet));
#endif /* TAO_POLLER */
@@ -845,15 +849,15 @@ TAO_TypeCodes::init (void)
static const CORBA::Long _oc_CORBA_Current[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
- 22,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f4375),
- ACE_NTOHL (0x7272656e),
- ACE_NTOHL (0x743a312e),
+ 22,
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f4375),
+ ACE_NTOHL (0x7272656e),
+ ACE_NTOHL (0x743a312e),
ACE_NTOHL (0x3000fdfd), // repository ID = IDL:CORBA/Current:1.0
- 8,
- ACE_NTOHL (0x43757272),
+ 8,
+ ACE_NTOHL (0x43757272),
ACE_NTOHL (0x656e7400), // name = Current,
};
CORBA::_tc_Current = new CORBA::TypeCode (CORBA::tk_objref,
@@ -949,7 +953,7 @@ TAO_TypeCodes::init (void)
// END bytes of encapsulation 0 (sequence params)
};
- TC_ServiceContextList =
+ TC_ServiceContextList =
new CORBA::TypeCode (CORBA::tk_sequence,
sizeof _oc_svc_ctx_list,
(char *) &_oc_svc_ctx_list,
@@ -1054,7 +1058,9 @@ TAO_TypeCodes::fini (void)
CORBA::release (CORBA::_tc_ORBid);
+#if !defined(TAO_HAS_MINIMUM_CORBA)
CORBA::release (CORBA_ORB::_tc_InconsistentTypeCode);
+#endif /* TAO_HAS_MINIMUM_CORBA */
CORBA::release (CORBA_ORB::_tc_ObjectId);
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index 9f9cfc0785e..eabbd4e77f4 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -165,6 +165,16 @@ class CORBA_NVList_var;
class CORBA_NVList_out;
typedef class CORBA_NVList *CORBA_NVList_ptr;
+class CORBA_Context;
+class CORBA_Context_var;
+class CORBA_Context_out;
+typedef class CORBA_Context *CORBA_Context_ptr;
+
+class CORBA_ContextList;
+class CORBA_ContextList_var;
+class CORBA_ContextList_out;
+typedef class CORBA_ContextList *CORBA_ContextList_ptr;
+
#endif /* ! TAO_HAS_MINIMUM_CORBA */
class CORBA_ORB;
@@ -177,16 +187,6 @@ class CORBA_Object_var;
class CORBA_Object_out;
typedef class CORBA_Object *CORBA_Object_ptr;
-class CORBA_Context;
-class CORBA_Context_var;
-class CORBA_Context_out;
-typedef class CORBA_Context *CORBA_Context_ptr;
-
-class CORBA_ContextList;
-class CORBA_ContextList_var;
-class CORBA_ContextList_out;
-typedef class CORBA_ContextList *CORBA_ContextList_ptr;
-
class CORBA_Current;
class CORBA_Current_var;
class CORBA_Current_out;
@@ -391,13 +391,6 @@ public:
typedef CORBA_NVList_var NVList_var;
typedef CORBA_NVList_out NVList_out;
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
- typedef CORBA_Object Object;
- typedef CORBA_Object *Object_ptr;
- typedef CORBA_Object_var Object_var;
- typedef CORBA_Object_out Object_out;
-
typedef CORBA_Context Context;
typedef CORBA_Context *Context_ptr;
typedef CORBA_Context_var Context_var;
@@ -408,6 +401,13 @@ public:
typedef CORBA_ContextList_var ContextList_var;
typedef CORBA_ContextList_out ContextList_out;
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
+ typedef CORBA_Object Object;
+ typedef CORBA_Object *Object_ptr;
+ typedef CORBA_Object_var Object_var;
+ typedef CORBA_Object_out Object_out;
+
typedef CORBA_Principal Principal;
typedef CORBA_Principal *Principal_ptr;
@@ -482,7 +482,6 @@ TAO_SYSTEM_EXCEPTION_LIST
// = all the CORBA::is_nil methods.
static Boolean is_nil (Object_ptr);
static Boolean is_nil (Environment_ptr);
- // static Boolean is_nil (Context_ptr);
static Boolean is_nil (TypeCode_ptr);
static Boolean is_nil (ORB_ptr);
static Boolean is_nil (Principal_ptr);
@@ -493,6 +492,7 @@ TAO_SYSTEM_EXCEPTION_LIST
static Boolean is_nil (Request_ptr);
static Boolean is_nil (NamedValue_ptr);
static Boolean is_nil (NVList_ptr);
+ // static Boolean is_nil (Context_ptr);
#endif /* TAO_HAS_MINIMUM_CORBA */
@@ -500,7 +500,6 @@ TAO_SYSTEM_EXCEPTION_LIST
static void release (Object_ptr);
static void release (Environment_ptr);
static void release (Principal_ptr);
- static void release (Context_ptr);
static void release (TypeCode_ptr);
static void release (ORB_ptr);
static void release (ServerRequest_ptr req);
@@ -510,6 +509,7 @@ TAO_SYSTEM_EXCEPTION_LIST
static void release (Request_ptr);
static void release (NamedValue_ptr);
static void release (NVList_ptr);
+ static void release (Context_ptr);
#endif /* TAO_HAS_MINIMUM_CORBA */
View Lorry Controller Status