summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Mesnier <mesnier_p@ociweb.com>2006-04-26 20:10:18 +0000
committerPhil Mesnier <mesnier_p@ociweb.com>2006-04-26 20:10:18 +0000
commitd4a143a940ad9f1a81e1959e3fff7105509660ab (patch)
tree08fac203b2a6b32de0b1c2dc9d25042235d50dd7
parent6e671634d09be60bd27919f9994674de68598408 (diff)
downloadATCD-d4a143a940ad9f1a81e1959e3fff7105509660ab.tar.gz
ChangeLog tag: Wed Apr 26 20:09:33 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com>
-rw-r--r--TAO/ChangeLog11
-rw-r--r--TAO/tao/EndpointPolicy/EndpointPolicyC.cpp11
-rw-r--r--TAO/tao/EndpointPolicy/EndpointPolicyC.h126
-rw-r--r--TAO/tao/EndpointPolicy/EndpointPolicyC.inl28
4 files changed, 72 insertions, 104 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index bfcb0a4c4b5..94594c03037 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Wed Apr 26 20:09:33 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com>
+
+ * tao/EndpointPolicy/EndpointPolicyC.h:
+ * tao/EndpointPolicy/EndpointPolicyC.cpp:
+
+ Fixed fuzz errors.
+
+ * tao/EndpointPolicy/EndpointPolicyC.inl:
+
+ Removed this file.
+
Wed Apr 26 19:44:36 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
* tao/Makefile.am:
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicyC.cpp b/TAO/tao/EndpointPolicy/EndpointPolicyC.cpp
index de557e569ac..1cfa58e8522 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicyC.cpp
+++ b/TAO/tao/EndpointPolicy/EndpointPolicyC.cpp
@@ -33,10 +33,6 @@
#include "tao/CDR.h"
#include "ace/OS_NS_string.h"
-#if !defined (__ACE_INLINE__)
-#include "EndpointPolicyC.inl"
-#endif /* !defined INLINE */
-
// TAO_IDL - Generated from
// be/be_visitor_arg_traits.cpp:71
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -123,7 +119,7 @@ EndpointPolicy::EndpointValueBase::_duplicate (EndpointValueBase_ptr obj)
{
obj->_add_ref ();
}
-
+
return obj;
}
@@ -173,7 +169,7 @@ EndpointPolicy::EndpointValueBase::marshal (TAO_OutputCDR &)
return false;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be/be_visitor_sequence/sequence_cs.cpp:65
#if !defined (_ENDPOINTPOLICY_ENDPOINTLIST_CS_)
@@ -300,7 +296,7 @@ EndpointPolicy::Policy::_duplicate (Policy_ptr obj)
{
obj->_add_ref ();
}
-
+
return obj;
}
@@ -353,4 +349,3 @@ EndpointPolicy::Policy::marshal (TAO_OutputCDR &)
{
return false;
}
-
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicyC.h b/TAO/tao/EndpointPolicy/EndpointPolicyC.h
index 12a7836e99f..6993b9640bd 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicyC.h
+++ b/TAO/tao/EndpointPolicy/EndpointPolicyC.h
@@ -64,22 +64,22 @@
namespace EndpointPolicy
{
-
+
// TAO_IDL - Generated from
// be/be_interface.cpp:640
#if !defined (_ENDPOINTPOLICY_ENDPOINTVALUEBASE__VAR_OUT_CH_)
#define _ENDPOINTPOLICY_ENDPOINTVALUEBASE__VAR_OUT_CH_
-
+
class EndpointValueBase;
typedef EndpointValueBase *EndpointValueBase_ptr;
-
+
typedef
TAO_Objref_Var_T<
EndpointValueBase
>
EndpointValueBase_var;
-
+
typedef
TAO_Objref_Out_T<
EndpointValueBase
@@ -87,98 +87,98 @@ namespace EndpointPolicy
EndpointValueBase_out;
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be/be_visitor_interface/interface_ch.cpp:54
#if !defined (_ENDPOINTPOLICY_ENDPOINTVALUEBASE_CH_)
#define _ENDPOINTPOLICY_ENDPOINTVALUEBASE_CH_
-
+
class TAO_EndpointPolicy_Export EndpointValueBase
: public virtual ::CORBA::Object
{
public:
typedef EndpointValueBase_ptr _ptr_type;
typedef EndpointValueBase_var _var_type;
-
+
// The static operations.
static EndpointValueBase_ptr _duplicate (EndpointValueBase_ptr obj);
-
+
static void _tao_release (EndpointValueBase_ptr obj);
-
+
static EndpointValueBase_ptr _narrow (
::CORBA::Object_ptr obj
ACE_ENV_ARG_DECL_WITH_DEFAULTS
);
-
+
static EndpointValueBase_ptr _unchecked_narrow (
::CORBA::Object_ptr obj
ACE_ENV_ARG_DECL_WITH_DEFAULTS
);
-
+
static EndpointValueBase_ptr _nil (void)
{
return static_cast<EndpointValueBase_ptr> (0);
}
-
-
-
+
+
+
// TAO_IDL - Generated from
// be/be_visitor_operation/operation_ch.cpp:46
-
+
virtual ::CORBA::ULong protocol_tag (
ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
)
ACE_THROW_SPEC ((
::CORBA::SystemException
)) = 0;
-
+
// TAO_IDL - Generated from
// be/be_visitor_interface/interface_ch.cpp:210
-
+
virtual ::CORBA::Boolean _is_a (
const char *type_id
ACE_ENV_ARG_DECL_WITH_DEFAULTS
);
-
+
virtual const char* _interface_repository_id (void) const;
virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+
protected:
// Abstract or local interface only.
EndpointValueBase (void);
-
+
virtual ~EndpointValueBase (void);
-
+
private:
// Private and unimplemented for concrete interfaces.
EndpointValueBase (const EndpointValueBase &);
-
+
void operator= (const EndpointValueBase &);
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be/be_visitor_sequence/sequence_ch.cpp:101
#if !defined (_ENDPOINTPOLICY_ENDPOINTLIST_CH_)
#define _ENDPOINTPOLICY_ENDPOINTLIST_CH_
-
+
class EndpointList;
-
+
typedef
TAO_VarSeq_Var_T<
EndpointList
>
EndpointList_var;
-
+
typedef
TAO_Seq_Out_T<
EndpointList
>
EndpointList_out;
-
+
class TAO_EndpointPolicy_Export EndpointList
: public
TAO::unbounded_object_reference_sequence<
@@ -192,34 +192,34 @@ namespace EndpointPolicy
EndpointList (
::CORBA::ULong max,
::CORBA::ULong length,
- EndpointValueBase_ptr* buffer,
+ EndpointValueBase_ptr* buffer,
::CORBA::Boolean release = false
);
EndpointList (const EndpointList &);
~EndpointList (void);
-
+
static void _tao_any_destructor (void *);
-
+
typedef EndpointList_var _var_type;
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be/be_interface.cpp:640
#if !defined (_ENDPOINTPOLICY_POLICY__VAR_OUT_CH_)
#define _ENDPOINTPOLICY_POLICY__VAR_OUT_CH_
-
+
class Policy;
typedef Policy *Policy_ptr;
-
+
typedef
TAO_Objref_Var_T<
Policy
>
Policy_var;
-
+
typedef
TAO_Objref_Out_T<
Policy
@@ -227,93 +227,93 @@ namespace EndpointPolicy
Policy_out;
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be/be_visitor_interface/interface_ch.cpp:54
#if !defined (_ENDPOINTPOLICY_POLICY_CH_)
#define _ENDPOINTPOLICY_POLICY_CH_
-
+
class TAO_EndpointPolicy_Export Policy
: public virtual ::CORBA::Policy
{
public:
typedef Policy_ptr _ptr_type;
typedef Policy_var _var_type;
-
+
// The static operations.
static Policy_ptr _duplicate (Policy_ptr obj);
-
+
static void _tao_release (Policy_ptr obj);
-
+
static Policy_ptr _narrow (
::CORBA::Object_ptr obj
ACE_ENV_ARG_DECL_WITH_DEFAULTS
);
-
+
static Policy_ptr _unchecked_narrow (
::CORBA::Object_ptr obj
ACE_ENV_ARG_DECL_WITH_DEFAULTS
);
-
+
static Policy_ptr _nil (void)
{
return static_cast<Policy_ptr> (0);
}
-
-
-
+
+
+
// TAO_IDL - Generated from
// be/be_visitor_operation/operation_ch.cpp:46
-
+
virtual ::EndpointPolicy::EndpointList * value (
ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
)
ACE_THROW_SPEC ((
::CORBA::SystemException
)) = 0;
-
+
// TAO_IDL - Generated from
// be/be_visitor_operation/operation_ch.cpp:46
-
+
virtual ::CORBA::Policy_ptr copy (
ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
)
ACE_THROW_SPEC ((
::CORBA::SystemException
)) = 0;
-
+
// TAO_IDL - Generated from
// be/be_visitor_operation/operation_ch.cpp:46
-
+
virtual void destroy (
ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
)
ACE_THROW_SPEC ((
::CORBA::SystemException
)) = 0;
-
+
// TAO_IDL - Generated from
// be/be_visitor_interface/interface_ch.cpp:210
-
+
virtual ::CORBA::Boolean _is_a (
const char *type_id
ACE_ENV_ARG_DECL_WITH_DEFAULTS
);
-
+
virtual const char* _interface_repository_id (void) const;
virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+
protected:
// Abstract or local interface only.
Policy (void);
-
+
virtual ~Policy (void);
-
+
private:
// Private and unimplemented for concrete interfaces.
Policy (const Policy &);
-
+
void operator= (const Policy &);
};
@@ -336,7 +336,7 @@ namespace TAO
#if !defined (_ENDPOINTPOLICY_ENDPOINTVALUEBASE__TRAITS_)
#define _ENDPOINTPOLICY_ENDPOINTVALUEBASE__TRAITS_
-
+
template<>
struct TAO_EndpointPolicy_Export Objref_Traits< ::EndpointPolicy::EndpointValueBase>
{
@@ -357,7 +357,7 @@ namespace TAO
#if !defined (_ENDPOINTPOLICY_POLICY__TRAITS_)
#define _ENDPOINTPOLICY_POLICY__TRAITS_
-
+
template<>
struct TAO_EndpointPolicy_Export Objref_Traits< ::EndpointPolicy::Policy>
{
@@ -378,16 +378,6 @@ namespace TAO
}
TAO_END_VERSIONED_NAMESPACE_DECL
-
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1092
-#if defined (__ACE_INLINE__)
-#include "EndpointPolicyC.inl"
-#endif /* defined INLINE */
-
#include /**/ "ace/post.h"
#endif /* ifndef */
-
-
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicyC.inl b/TAO/tao/EndpointPolicy/EndpointPolicyC.inl
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/EndpointPolicy/EndpointPolicyC.inl
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// **** Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-// Center for Distributed Object Computing
-// Washington University
-// St. Louis, MO
-// USA
-// http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-// Distributed Object Computing Laboratory
-// University of California at Irvine
-// Irvine, CA
-// USA
-// http://doc.ece.uci.edu/
-// and
-// Institute for Software Integrated Systems
-// Vanderbilt University
-// Nashville, TN
-// USA
-// http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-// http://www.cs.wustl.edu/~schmidt/TAO.html
-
-