summaryrefslogtreecommitdiff
path: root/ACE/ace/Condition_Attributes.h
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2012-08-20 08:13:23 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2012-08-20 08:13:23 +0000
commitb148972cae812478aaa7b61db111e01f5f2d73c9 (patch)
tree459ec4ca233101eb95dcae3ddbc1c1a590689219 /ACE/ace/Condition_Attributes.h
parent280cd7e81799a75a79b33ee1ab21eca582252a96 (diff)
downloadATCD-b148972cae812478aaa7b61db111e01f5f2d73c9.tar.gz
Mon Aug 20 07:57:53 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Condition_Attributes.h: * ace/Condition_Attributes.inl: Added accessor for attributes and removed friend declaration, that hopefully fixes the Sun Studio 11 problems * ace/Condition_Recursive_Thread_Mutex.cpp: * ace/Condition_T.cpp: * ace/Condition_Thread_Mutex.cpp: Use accessor of the attributes.
Diffstat (limited to 'ACE/ace/Condition_Attributes.h')
-rw-r--r--ACE/ace/Condition_Attributes.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/ACE/ace/Condition_Attributes.h b/ACE/ace/Condition_Attributes.h
index 56d4393a2df..fef2a52103e 100644
--- a/ACE/ace/Condition_Attributes.h
+++ b/ACE/ace/Condition_Attributes.h
@@ -26,8 +26,6 @@
#if defined (ACE_HAS_THREADS)
-template <class MUTEX> class ACE_Condition;
-
// ACE platform supports some form of threading.
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -41,9 +39,10 @@ public:
/// Destructor
~ACE_Condition_Attributes (void);
-protected:
- template <class MUTEX> friend class ACE_Condition;
+ /// Accessor for retrieving the current attributes
+ const ACE_condattr_t& attributes (void) const;
+protected:
/// The attributes
ACE_condattr_t attributes_;