diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-06-20 05:44:08 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-06-20 05:44:08 +0000 |
| commit | 4e6046ed24af4b89fb2a62463c391fb7515971bf (patch) | |
| tree | 6b6aa2bc85983de18b4c2c51a46ecd198f942487 | |
| parent | 77493db37de647036d8c4b047bacef392836c922 (diff) | |
| download | ATCD-4e6046ed24af4b89fb2a62463c391fb7515971bf.tar.gz | |
*** empty log message ***
| -rw-r--r-- | ChangeLog-98b | 12 | ||||
| -rw-r--r-- | ace/Memory_Pool.cpp | 12 |
2 files changed, 18 insertions, 6 deletions
diff --git a/ChangeLog-98b b/ChangeLog-98b index 2f0d7646253..138a349b1fe 100644 --- a/ChangeLog-98b +++ b/ChangeLog-98b @@ -1,3 +1,15 @@ +Sat Jun 20 00:28:57 1998 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/OS.cpp (thr_create): Specify <priority> as an unused + argument when ACE_LACKS_SETSCHED. + + * ace/OS.{h,i,cpp}: Rearrange macro indentations. + + * bin/indent_macros.perl: This little perl script rearrange the + indentation of macros so they are a bit easier to debug. + + * ace/config-freebsd-pthread.h: Defined ACE_LACKS_PTHREAD_CANCEL. + Sat Jun 20 00:14:07 1998 Alexander Babu Arulanthu <alex@merengue.cs.wustl.edu> * examples/Reactor/Proactor/test_proactor_with_aio.cpp: Test diff --git a/ace/Memory_Pool.cpp b/ace/Memory_Pool.cpp index b24f700a39e..bf0772c3475 100644 --- a/ace/Memory_Pool.cpp +++ b/ace/Memory_Pool.cpp @@ -626,26 +626,26 @@ ACE_Shared_Memory_Pool::ACE_Shared_Memory_Pool (LPCTSTR backing_store_name, this->minimum_bytes_ = options->minimum_bytes_; } - if (backing_store_name) + if (backing_store_name) { // Convert the string into a number that is used as the segment // key. - int result = ::sscanf (backing_store_name, + int result = ::sscanf (backing_store_name, "%d", &this->base_shm_key_); - if (result == 0 || result == EOF) + if (result == 0 || result == EOF) // The conversion to a number failed so hash with crc32 // ACE::crc32 is also used in <SV_Semaphore_Simple>. this->base_shm_key_ = (key_t) ACE::crc32 (backing_store_name); - if (this->base_shm_key_ == IPC_PRIVATE) + if (this->base_shm_key_ == IPC_PRIVATE) // Make sure that the segment can be shared between unrelated // processes. this->base_shm_key_ = ACE_DEFAULT_SHM_KEY; - } - else + } + else this->base_shm_key_ = ACE_DEFAULT_SHM_KEY; if (this->signal_handler_.register_handler (SIGSEGV, this) == -1) |