diff options
| -rw-r--r-- | ChangeLog-99b | 7 | ||||
| -rw-r--r-- | ace/Shared_Memory_MM.cpp | 31 | ||||
| -rw-r--r-- | ace/Shared_Memory_MM.h | 6 | ||||
| -rw-r--r-- | ace/Shared_Memory_MM.i | 38 |
4 files changed, 44 insertions, 38 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index 4da30d2075c..80ac46c7037 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,3 +1,10 @@ +Fri Jul 09 10:25:42 1999 Irfan Pyarali <irfan@cs.wustl.edu> + + * ace/Shared_Memory_MM.h (ACE_Shared_Memory_MM): Changed the + filename parameter from a non-const string to a const string. + Thanks to Ulf Jaehrig <jaehrig@desys.com> for pointing out this + problem. + Fri Jul 09 03:31:34 1999 David L. Levine <levine@cs.wustl.edu> * ace/Basic_Types.i: added const to each of the static casts. diff --git a/ace/Shared_Memory_MM.cpp b/ace/Shared_Memory_MM.cpp index f66a42784dd..c3564828f10 100644 --- a/ace/Shared_Memory_MM.cpp +++ b/ace/Shared_Memory_MM.cpp @@ -21,26 +21,26 @@ ACE_Shared_Memory_MM::dump (void) const // Creates a shared memory segment of SIZE bytes. ACE_Shared_Memory_MM::ACE_Shared_Memory_MM (ACE_HANDLE handle, - int length, - int prot, - int share, - char *addr, - off_t pos) + int length, + int prot, + int share, + char *addr, + off_t pos) : shared_memory_ (handle, length, prot, share, addr, pos) { ACE_TRACE ("ACE_Shared_Memory_MM::ACE_Shared_Memory_MM"); } -ACE_Shared_Memory_MM::ACE_Shared_Memory_MM (LPTSTR file_name, - int len, - int flags, - int mode, - int prot, - int share, - char *addr, - off_t pos) - : shared_memory_ (file_name, len, flags, mode, - prot, share, addr, pos) +ACE_Shared_Memory_MM::ACE_Shared_Memory_MM (LPCTSTR file_name, + int len, + int flags, + int mode, + int prot, + int share, + char *addr, + off_t pos) + : shared_memory_ (file_name, len, flags, mode, + prot, share, addr, pos) { ACE_TRACE ("ACE_Shared_Memory_MM::ACE_Shared_Memory_MM"); } @@ -51,4 +51,3 @@ ACE_Shared_Memory_MM::ACE_Shared_Memory_MM (void) { ACE_TRACE ("ACE_Shared_Memory_MM::ACE_Shared_Memory_MM"); } - diff --git a/ace/Shared_Memory_MM.h b/ace/Shared_Memory_MM.h index 3a29becf230..57e41db8a9f 100644 --- a/ace/Shared_Memory_MM.h +++ b/ace/Shared_Memory_MM.h @@ -33,7 +33,7 @@ class ACE_Export ACE_Shared_Memory_MM : public ACE_Shared_Memory // = DESCRIPTION // This class provides a very simple-minded shared memory // manager. For more a powerful memory allocator please see - // <ACE_Malloc>. + // <ACE_Malloc>. public: // = Initialization and termination methods. ACE_Shared_Memory_MM (void); @@ -47,7 +47,7 @@ public: off_t pos = 0); // Constructor. - ACE_Shared_Memory_MM (LPTSTR file_name, + ACE_Shared_Memory_MM (LPCTSTR file_name, int len = -1, int flags = O_RDWR | O_CREAT, int mode = ACE_DEFAULT_FILE_PERMS, @@ -64,7 +64,7 @@ public: off_t pos = 0); // Open method. - int open (LPTSTR file_name, + int open (LPCTSTR file_name, int len = -1, int flags = O_RDWR | O_CREAT, int mode = ACE_DEFAULT_FILE_PERMS, diff --git a/ace/Shared_Memory_MM.i b/ace/Shared_Memory_MM.i index 1693bdfb2a4..721b56be3dc 100644 --- a/ace/Shared_Memory_MM.i +++ b/ace/Shared_Memory_MM.i @@ -11,31 +11,31 @@ ACE_Shared_Memory_MM::filename (void) const return this->shared_memory_.filename (); } -ACE_INLINE int -ACE_Shared_Memory_MM::open (ACE_HANDLE handle, - int length, - int prot, - int share, - char *addr, - off_t pos) +ACE_INLINE int +ACE_Shared_Memory_MM::open (ACE_HANDLE handle, + int length, + int prot, + int share, + char *addr, + off_t pos) { ACE_TRACE ("ACE_Shared_Memory_MM::open"); return shared_memory_.map (handle, length, prot, share, addr, pos); } -ACE_INLINE int -ACE_Shared_Memory_MM::open (LPTSTR file_name, - int len, - int flags, - int mode, - int prot, - int share, - char *addr, - off_t pos) +ACE_INLINE int +ACE_Shared_Memory_MM::open (LPCTSTR file_name, + int len, + int flags, + int mode, + int prot, + int share, + char *addr, + off_t pos) { ACE_TRACE ("ACE_Shared_Memory_MM::open"); - return shared_memory_.map (file_name, len, flags, mode, - prot, share, addr, pos); + return shared_memory_.map (file_name, len, flags, mode, + prot, share, addr, pos); } // The overall size of the segment. @@ -81,7 +81,7 @@ ACE_Shared_Memory_MM::get_id (void) const return this->shared_memory_.handle (); } -ACE_INLINE int +ACE_INLINE int ACE_Shared_Memory_MM::free (void *p) { ACE_TRACE ("ACE_Shared_Memory_MM::free"); |