summaryrefslogtreecommitdiff
path: root/TAO/tao/RTCORBA/RT_Stub.h
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/RTCORBA/RT_Stub.h')
-rw-r--r--TAO/tao/RTCORBA/RT_Stub.h23
1 files changed, 12 insertions, 11 deletions
diff --git a/TAO/tao/RTCORBA/RT_Stub.h b/TAO/tao/RTCORBA/RT_Stub.h
index fcaf8a32562..a2c18299ba6 100644
--- a/TAO/tao/RTCORBA/RT_Stub.h
+++ b/TAO/tao/RTCORBA/RT_Stub.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
//=============================================================================
/**
* @file RT_Stub.h
@@ -23,7 +21,7 @@
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-#include "tao/RTCORBA/rtcorba_export.h"
+#include "rtcorba_export.h"
#include "tao/Stub.h"
@@ -31,14 +29,14 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
// Forward references.
class TAO_PriorityModelPolicy;
class TAO_PriorityBandedConnectionPolicy;
class TAO_ClientProtocolPolicy;
class TAO_PrivateConnectionPolicy;
+
+
/**
* @class TAO_RT_Stub
*
@@ -125,14 +123,17 @@ private:
CORBA::Boolean are_policies_parsed_;
private:
- // = Disallow copying and assignment.
- TAO_RT_Stub (const TAO_RT_Stub &);
- TAO_RT_Stub &operator = (const TAO_RT_Stub &);
-
+ // = Disallow copy constructor and assignment operator.
+ ACE_UNIMPLEMENTED_FUNC (TAO_RT_Stub (const TAO_RT_Stub &))
+ ACE_UNIMPLEMENTED_FUNC (TAO_RT_Stub &operator = (const TAO_RT_Stub &))
+
+#if defined (__GNUG__)
+ // G++ (even 2.6.3) stupidly thinks instances can't be created.
+ // This de-warns.
+ friend class everyone_needs_a_friend;
+#endif /* __GNUG__ */
};
-TAO_END_VERSIONED_NAMESPACE_DECL
-
#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
#include /**/ "ace/post.h"