summaryrefslogtreecommitdiff
path: root/TAO/tests/Bug_1551_Regression
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2005-07-04 08:55:12 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2005-07-04 08:55:12 +0000
commitefa3cae323b347a2aa2a55823f8ff6bc068d3367 (patch)
tree895ae46c3a981a6a44e800f560ac08464b111aa9 /TAO/tests/Bug_1551_Regression
parentd21047dce23792c86471363e6053b9209986b311 (diff)
downloadATCD-efa3cae323b347a2aa2a55823f8ff6bc068d3367.tar.gz
ChangeLogTag: Mon Jul 4 08:48:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tests/Bug_1551_Regression')
-rw-r--r--TAO/tests/Bug_1551_Regression/Hello.h10
-rw-r--r--TAO/tests/Bug_1551_Regression/Reply_Handler.h1
2 files changed, 0 insertions, 11 deletions
diff --git a/TAO/tests/Bug_1551_Regression/Hello.h b/TAO/tests/Bug_1551_Regression/Hello.h
index 5a201a415a1..156365e9b6b 100644
--- a/TAO/tests/Bug_1551_Regression/Hello.h
+++ b/TAO/tests/Bug_1551_Regression/Hello.h
@@ -9,14 +9,8 @@
#include "TestS.h"
-#if defined (_MSC_VER)
-# pragma warning(push)
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
class Hello
: public virtual POA_Test::Hello
- , public virtual PortableServer::RefCountServantBase
{
public:
/// Constructor
@@ -33,9 +27,5 @@ private:
ACE_Atomic_Op<TAO_SYNCH_MUTEX,long> atomic_counter_;
};
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
#include /**/ "ace/post.h"
#endif /* HELLO_H */
diff --git a/TAO/tests/Bug_1551_Regression/Reply_Handler.h b/TAO/tests/Bug_1551_Regression/Reply_Handler.h
index 6da1dcea8e5..aaadd0582f0 100644
--- a/TAO/tests/Bug_1551_Regression/Reply_Handler.h
+++ b/TAO/tests/Bug_1551_Regression/Reply_Handler.h
@@ -11,7 +11,6 @@
class Reply_Handler
: public POA_Test::AMI_HelloHandler
- , public PortableServer::RefCountServantBase
{
public:
Reply_Handler (