summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2009-11-02 14:45:59 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2009-11-02 14:45:59 +0000
commit667bfe97053e8546ed7230035721df9b12f50502 (patch)
treeb37b33d77ce31260fab74362b95fb40f03c2c8f4
parentdef3070b04ce6c86ac56133e938f981f69d9a399 (diff)
downloadATCD-667bfe97053e8546ed7230035721df9b12f50502.tar.gz
Mon Nov 2 13:45:05 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/RW_Process_Mutex.h: * ace/Default_Constants.h: Added ACE_DEFAULT_RW_PROCESS_MUTEX_PERMS with which the end user can override the default permissions * ace/Addr.inl: * ace/MMAP_Memory_Pool.cpp: Doxygen changes
-rw-r--r--ACE/ChangeLog11
-rw-r--r--ACE/ace/Addr.inl12
-rw-r--r--ACE/ace/Default_Constants.h8
-rw-r--r--ACE/ace/MMAP_Memory_Pool.cpp5
-rw-r--r--ACE/ace/RW_Process_Mutex.h12
5 files changed, 28 insertions, 20 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index dc3d5d805e0..dc759cff87c 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,14 @@
+Mon Nov 2 13:45:05 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ace/RW_Process_Mutex.h:
+ * ace/Default_Constants.h:
+ Added ACE_DEFAULT_RW_PROCESS_MUTEX_PERMS with which the end user
+ can override the default permissions
+
+ * ace/Addr.inl:
+ * ace/MMAP_Memory_Pool.cpp:
+ Doxygen changes
+
Mon Nov 2 08:52:05 UTC 2009 Olli Savia <ops@iki.fi>
* tests/OS_Test.cpp:
diff --git a/ACE/ace/Addr.inl b/ACE/ace/Addr.inl
index 3780e04b6aa..dc8e9286dc1 100644
--- a/ACE/ace/Addr.inl
+++ b/ACE/ace/Addr.inl
@@ -20,32 +20,28 @@ ACE_Addr::operator != (const ACE_Addr &sap) const
sap.addr_size_ != this->addr_size_ );
}
-// Return the size of the address.
-
+/// Return the size of the address.
ACE_INLINE int
ACE_Addr::get_size (void) const
{
return this->addr_size_;
}
-// Sets the size of the address.
-
+/// Sets the size of the address.
ACE_INLINE void
ACE_Addr::set_size (int size)
{
this->addr_size_ = size;
}
-// Return the type of the address.
-
+/// Return the type of the address.
ACE_INLINE int
ACE_Addr::get_type (void) const
{
return this->addr_type_;
}
-// Set the type of the address.
-
+/// Set the type of the address.
ACE_INLINE void
ACE_Addr::set_type (int type)
{
diff --git a/ACE/ace/Default_Constants.h b/ACE/ace/Default_Constants.h
index f5f061661c7..e0edf320f8a 100644
--- a/ACE/ace/Default_Constants.h
+++ b/ACE/ace/Default_Constants.h
@@ -579,6 +579,14 @@
#define ACE_DEFAULT_LOCALNAME ACE_TEXT (ACE_DEFAULT_LOCALNAME_A)
#define ACE_DEFAULT_GLOBALNAME ACE_TEXT (ACE_DEFAULT_GLOBALNAME_A)
+#if !defined (ACE_DEFAULT_RW_PROCESS_MUTEX_PERMS)
+# if defined (ACE_WIN32)
+# define ACE_DEFAULT_RW_PROCESS_MUTEX_PERMS ACE_DEFAULT_OPEN_PERMS
+# else
+# define ACE_DEFAULT_RW_PROCESS_MUTEX_PERMS S_IRUSR | S_IWUSR
+# endif /* ACE_WIN32 */
+#endif /* ACE_DEFAULT_RW_PROCESS_MUTEX_PERMS */
+
# if defined (ACE_WIN32)
// The "null" device on Win32.
# define ACE_DEV_NULL "nul"
diff --git a/ACE/ace/MMAP_Memory_Pool.cpp b/ACE/ace/MMAP_Memory_Pool.cpp
index a4109687b04..c5acb9e9c53 100644
--- a/ACE/ace/MMAP_Memory_Pool.cpp
+++ b/ACE/ace/MMAP_Memory_Pool.cpp
@@ -69,9 +69,8 @@ ACE_MMAP_Memory_Pool::sync (int flags)
return this->mmap_.sync (len, flags);
}
-// Sync <len> bytes of the memory region to the backing store starting
-// at <addr_>.
-
+/// Sync @a len bytes of the memory region to the backing store starting
+/// at <addr_>.
int
ACE_MMAP_Memory_Pool::sync (void *addr, size_t len, int flags)
{
diff --git a/ACE/ace/RW_Process_Mutex.h b/ACE/ace/RW_Process_Mutex.h
index 318d9752fe0..817e3f14d7e 100644
--- a/ACE/ace/RW_Process_Mutex.h
+++ b/ACE/ace/RW_Process_Mutex.h
@@ -44,17 +44,11 @@ class ACE_Export ACE_RW_Process_Mutex
public:
/// Create a cross-process readers/writer mutex, passing in the optional
/// @a name, @a flags and @a mode \sa ACE_File_Lock.
- /// If not specified, a name is generated and flags and mode are set
- /// to default platform values.
-#if defined (ACE_WIN32)
+ /// If not specified, a name is generated and flags and mode are set
+ /// to default platform values.
ACE_RW_Process_Mutex (const ACE_TCHAR *name = 0,
int flags = O_CREAT|O_RDWR,
- mode_t mode = ACE_DEFAULT_OPEN_PERMS);
-#else
- ACE_RW_Process_Mutex (const ACE_TCHAR *name = 0,
- int flags = O_CREAT|O_RDWR,
- mode_t mode = S_IRUSR | S_IWUSR );
-#endif /* ACE_WIN32 */
+ mode_t mode = ACE_DEFAULT_RW_PROCESS_MUTEX_PERMS);
~ACE_RW_Process_Mutex (void);