From 1ce4bfe566cacc77785f53a0133d4c40f1d4146b Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed, 24 Jan 2007 13:42:44 +0000
Subject: Wed Jan 24 12:25:12 UTC 2007  Johnny Willemsen 
 <jwillemsen@remedy.nl>

---
 TAO/tao/DynamicAny/DynUnion_i.h | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'TAO/tao/DynamicAny/DynUnion_i.h')

diff --git a/TAO/tao/DynamicAny/DynUnion_i.h b/TAO/tao/DynamicAny/DynUnion_i.h
index e3498b65ef9..28ac989dd3b 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.h
+++ b/TAO/tao/DynamicAny/DynUnion_i.h
@@ -51,20 +51,20 @@ public:
   ~TAO_DynUnion_i (void);
 
   /// Constructor taking an Any argument.
-  void init (const CORBA::Any& any ACE_ENV_ARG_DECL);
+  void init (const CORBA::Any& any);
 
   /// Constructor taking a typecode argument.
-  void init (CORBA::TypeCode_ptr tc ACE_ENV_ARG_DECL);
+  void init (CORBA::TypeCode_ptr tc);
 
   // = LocalObject methods.
   static TAO_DynUnion_i *_narrow (
       CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      );
 
   // = Functions specific to DynUnion.
 
   virtual DynamicAny::DynAny_ptr get_discriminator (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -72,7 +72,7 @@ public:
 
   virtual void set_discriminator (
       DynamicAny::DynAny_ptr d
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -80,7 +80,7 @@ public:
       ));
 
   virtual void set_to_default_member (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -88,7 +88,7 @@ public:
       ));
 
   virtual void set_to_no_active_member (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -96,21 +96,21 @@ public:
       ));
 
   virtual CORBA::Boolean has_no_active_member (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual CORBA::TCKind discriminator_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual DynamicAny::DynAny_ptr member (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -118,7 +118,7 @@ public:
       ));
 
   virtual char * member_name (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -126,7 +126,7 @@ public:
       ));
 
   virtual CORBA::TCKind member_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -137,7 +137,7 @@ public:
 
   virtual void from_any (
       const CORBA::Any & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -146,7 +146,7 @@ public:
       ));
 
   virtual CORBA::Any * to_any (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -154,21 +154,21 @@ public:
 
   virtual CORBA::Boolean equal (
       DynamicAny::DynAny_ptr dyn_any
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual DynamicAny::DynAny_ptr current_component (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -179,7 +179,7 @@ private:
   /// Code common to the constructor from an Any arg and the member
   /// function from_any().
   void set_from_any (const CORBA::Any &any
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                     )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -192,7 +192,7 @@ private:
   /// Iterative check for label value match.
   CORBA::Boolean label_match (const CORBA::Any &my_any,
                               const CORBA::Any &other_any
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                              )
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-- 
cgit v1.2.1