1 files changed, 4 insertions, 11 deletions
diff --git a/TAO/tao/Wait_On_LF_No_Upcall.cpp b/TAO/tao/Wait_On_LF_No_Upcall.cpp
index 1a039a0b089..00075a77b84 100644
--- a/TAO/tao/Wait_On_LF_No_Upcall.cpp
+++ b/TAO/tao/Wait_On_LF_No_Upcall.cpp
@@ -5,14 +5,12 @@
 #include "tao/Transport.h"
 #include "tao/ORB_Core.h"
 #include "tao/ORB_Core_TSS_Resources.h"
-#include "tao/debug.h"
+#include "debug.h"
 
 ACE_RCSID(tao,
           Wait_On_LF_No_Upcall,
           "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Transport;
 namespace TAO
 {
@@ -58,13 +56,10 @@ namespace TAO
 
   private:
 
-    Nested_Upcall_Guard (void) {}
-
-    /// Disallow copying and assignment.
-    Nested_Upcall_Guard (const Nested_Upcall_Guard&);
-    Nested_Upcall_Guard & operator= (const Nested_Upcall_Guard&);
+    ACE_UNIMPLEMENTED_FUNC (Nested_Upcall_Guard (void))
 
-  private:
+    ACE_UNIMPLEMENTED_FUNC (Nested_Upcall_Guard (
+                              const Nested_Upcall_Guard&))
 
     /// Pointer to the transport that we plan to use.
     TAO_Transport* t_;
@@ -105,5 +100,3 @@ namespace TAO
     return true;
   }
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL