ChangeLogTag: Thu Aug 16 09:22:31 UTC 2012 Martin Corino <mcorino@remedy.nl>

1 files changed, 22 insertions, 12 deletions

diff --git a/ACE/ace/Null_Condition.h b/ACE/ace/Null_Condition.h
index 31a2cbc9d16..0aec03c3307 100644
--- a/ACE/ace/Null_Condition.h
+++ b/ACE/ace/Null_Condition.h
@@ -26,24 +26,32 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
+template <class ACE_LOCK> class ACE_Condition;
+
 class ACE_Time_Value;
+class ACE_Condition_Attributes;
 
 /**
- * @class ACE_Null_Condition
- *
- * @brief Implement a do nothing ACE_Condition variable wrapper,
- * i.e., all methods are no ops.  This class is necessary since
- * some C++ compilers are *very* lame...
+ * @brief ACE_Condition template specialization written using
+ * ACE_Null_Mutexes. Implements a do nothing ACE_Condition
+ * specialization, i.e., all methods are no ops.
  */
-class ACE_Null_Condition
+template <>
+class ACE_Condition<ACE_Null_Mutex>
 {
 public:
-  ACE_Null_Condition (const ACE_Null_Mutex &m,
-                      const ACE_TCHAR * = 0,
-                      void * = 0)
+  ACE_Condition (const ACE_Null_Mutex &m,
+                 const ACE_TCHAR * = 0,
+                 void * = 0)
     : mutex_ ((ACE_Null_Mutex &) m) {}
 
-  ~ACE_Null_Condition (void) {}
+  ACE_Condition (const ACE_Null_Mutex &m,
+                 const ACE_Condition_Attributes &,
+                 const ACE_TCHAR * = 0,
+                 void * = 0)
+  : mutex_ ((ACE_Null_Mutex &) m) {}
+
+  ~ACE_Condition (void) {}
 
   /// Returns 0.
   int remove (void) {return 0;}
@@ -73,10 +81,12 @@ protected:
 
 private:
   // = Prevent assignment and initialization.
-  void operator= (const ACE_Null_Condition &);
-  ACE_Null_Condition (const ACE_Null_Condition &);
+  void operator= (const ACE_Condition<ACE_Null_Mutex> &);
+  ACE_Condition (const ACE_Condition<ACE_Null_Mutex> &);
 };
 
+typedef ACE_Condition<ACE_Null_Mutex> ACE_Null_Condition;
+
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"