summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2010-09-17 09:21:33 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2010-09-17 09:21:33 +0000
commit6e3bf5a1b876bcc3588b839dbad0fc9b6df64fa9 (patch)
treeaf266b99dc7f1ec255bb14120abe2379b9aad7c2
parent5297cd22d79c7e4728aaaa9baf9b03a1bef51c79 (diff)
downloadATCD-6e3bf5a1b876bcc3588b839dbad0fc9b6df64fa9.tar.gz
Fri Sep 17 09:17:34 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/Utils/Synch_Refcountable.h: * tao/Utils/Synch_Refcountable.inl: * tao/Utils/Synch_Refcountable.cpp: Removed these files, not used anymore, ACE_Atomic_Op is what is used instead
-rw-r--r--TAO/ChangeLog8
-rw-r--r--TAO/tao/Utils/Synch_Refcountable.cpp25
-rw-r--r--TAO/tao/Utils/Synch_Refcountable.h63
-rw-r--r--TAO/tao/Utils/Synch_Refcountable.inl29
4 files changed, 8 insertions, 117 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index ff5880321a6..401e6542d16 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Fri Sep 17 09:17:34 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tao/Utils/Synch_Refcountable.h:
+ * tao/Utils/Synch_Refcountable.inl:
+ * tao/Utils/Synch_Refcountable.cpp:
+ Removed these files, not used anymore, ACE_Atomic_Op is what is used
+ instead
+
Fri Sep 17 06:26:49 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
diff --git a/TAO/tao/Utils/Synch_Refcountable.cpp b/TAO/tao/Utils/Synch_Refcountable.cpp
deleted file mode 100644
index 0af94d544ea..00000000000
--- a/TAO/tao/Utils/Synch_Refcountable.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-// $Id$
-
-#include "tao/Utils/Synch_Refcountable.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Utils/Synch_Refcountable.inl"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/Log_Msg.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_Synch_Refcountable::TAO_Synch_Refcountable (ACE_Lock *lock, int refcount)
- : ACE_Refcountable_T<ACE_Null_Mutex> (refcount)
- , refcount_lock_ (lock)
-{
-}
-
-TAO_Synch_Refcountable::~TAO_Synch_Refcountable (void)
-{
- ACE_ASSERT (this->refcount_ == 0);
- delete this->refcount_lock_;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Utils/Synch_Refcountable.h b/TAO/tao/Utils/Synch_Refcountable.h
deleted file mode 100644
index b3ee9f9dd6c..00000000000
--- a/TAO/tao/Utils/Synch_Refcountable.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file Synch_Refcountable.h
- *
- * $Id$
- *
- * Definition for a synchronised refcountable interface.
- *
- * @author Fred Kuhns <fredk@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_SYNCH_REFCOUNTABLE_H
-#define TAO_SYNCH_REFCOUNTABLE_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Refcountable_T.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Utils/utils_export.h"
-#include "tao/Versioned_Namespace.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Lock;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class TAO_Synch_Refcountable
- *
- * @brief Definition for a synchronised refcountable interface.
- */
-class TAO_UTILS_Export TAO_Synch_Refcountable : private ACE_Refcountable_T<ACE_Null_Mutex>
-{
-public:
- virtual ~TAO_Synch_Refcountable (void);
-
- int increment (void);
- int decrement (void);
-
- int refcount (void) const;
-
-protected:
- TAO_Synch_Refcountable (ACE_Lock *lock, int refcount);
-
- ACE_Lock *refcount_lock_;
-};
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-# include "tao/Utils/Synch_Refcountable.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /*TAO_SYNCH_REFCOUNTABLE*/
diff --git a/TAO/tao/Utils/Synch_Refcountable.inl b/TAO/tao/Utils/Synch_Refcountable.inl
deleted file mode 100644
index 0605de4f4f9..00000000000
--- a/TAO/tao/Utils/Synch_Refcountable.inl
+++ /dev/null
@@ -1,29 +0,0 @@
-// -*- C++ -*-
-//
-//$Id$
-
-#include "ace/Guard_T.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE int
-TAO_Synch_Refcountable::increment (void)
-{
- ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->refcount_lock_, 0);
- return ACE_Refcountable_T<ACE_Null_Mutex>::increment ();
-}
-
-ACE_INLINE int
-TAO_Synch_Refcountable::decrement (void)
-{
- ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->refcount_lock_, 0);
- return ACE_Refcountable_T<ACE_Null_Mutex>::decrement ();
-}
-
-ACE_INLINE int
-TAO_Synch_Refcountable::refcount (void) const
-{
- return ACE_Refcountable_T<ACE_Null_Mutex>::refcount ();
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL