diff options
author | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-10-14 09:39:28 +0000 |
---|---|---|
committer | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-10-14 09:39:28 +0000 |
commit | 86720a46bc4eed0706a19987857e224104a07aba (patch) | |
tree | d64054342a3c7b82032e44f1f2c2e40d8e365876 | |
parent | d185fa9a601726451d82f7375ac894a18d3d7308 (diff) | |
download | ATCD-86720a46bc4eed0706a19987857e224104a07aba.tar.gz |
Thu Oct 14 09:38:00 UTC 2010 Martin Corino <mcorino@remedy.nl>
* tests/Bug_3911_Regression_Test.cpp:
Wchar build fixes.
-rw-r--r-- | ACE/ChangeLog | 5 | ||||
-rw-r--r-- | ACE/tests/Bug_3911_Regression_Test.cpp | 14 |
2 files changed, 12 insertions, 7 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index f5fb4ea4cb3..072349a1d41 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Thu Oct 14 09:38:00 UTC 2010 Martin Corino <mcorino@remedy.nl> + + * tests/Bug_3911_Regression_Test.cpp: + Wchar build fixes. + Wed Oct 13 08:24:00 UTC 2010 Martin Corino <mcorino@remedy.nl> * tests/Bug_3911_Regression_Test.cpp: diff --git a/ACE/tests/Bug_3911_Regression_Test.cpp b/ACE/tests/Bug_3911_Regression_Test.cpp index f9fb736ea24..9288a1e1884 100644 --- a/ACE/tests/Bug_3911_Regression_Test.cpp +++ b/ACE/tests/Bug_3911_Regression_Test.cpp @@ -95,24 +95,24 @@ public: return 0; }; - void* getMemoryBlock(ACE_TCHAR* block_name, unsigned int block_size) + void* getMemoryBlock(char* block_name, unsigned int block_size) { void* shared; - ACE_DEBUG((LM_INFO, ACE_TEXT("errno = %d. Looking for a Shared Memory block named %s\n"), + ACE_DEBUG((LM_INFO, ACE_TEXT("errno = %d. Looking for a Shared Memory block named %C\n"), ACE_OS::last_error(), block_name)); if (c_memory_pool->find(block_name, shared) == 0) { // An existing block was found, so take that: - ACE_DEBUG((LM_INFO, ACE_TEXT("Shared Memory block %s was found."), + ACE_DEBUG((LM_INFO, ACE_TEXT("Shared Memory block %C was found."), block_name)); } else { // Allocate the memory and bind it to a name: - ACE_DEBUG((LM_INFO, ACE_TEXT("Shared Memory block %s was not found. errno = %d. Trying to allocate new block\n"), + ACE_DEBUG((LM_INFO, ACE_TEXT("Shared Memory block %C was not found. errno = %d. Trying to allocate new block\n"), block_name, ACE_OS::last_error())); shared = c_memory_pool->malloc(block_size); @@ -122,11 +122,11 @@ public: ACE_OS::last_error())); return (void*)(-1); } - ACE_DEBUG((LM_INFO, ACE_TEXT("New Shared Memory block was allocated, trying to bind it to the name %s\n"), + ACE_DEBUG((LM_INFO, ACE_TEXT("New Shared Memory block was allocated, trying to bind it to the name %C\n"), block_name)); if (c_memory_pool->bind(block_name, shared) < 0) { - ACE_DEBUG((LM_INFO, ACE_TEXT("New Shared Memory block could not be bound to the name %s. errno = %d.\n"), + ACE_DEBUG((LM_INFO, ACE_TEXT("New Shared Memory block could not be bound to the name %C. errno = %d.\n"), block_name, ACE_OS::last_error())); @@ -153,7 +153,7 @@ run_main (int argc, ACE_TCHAR * argv[]) bool no_crash = (argc>1 && argv[1][0]=='1'); ShmemMan* smm = ShmemMan::getInstance (no_crash); - void* buf = smm->getMemoryBlock (ACE_TEXT("block_1"), 10 * 4096); + void* buf = smm->getMemoryBlock ("block_1", 10 * 4096); ACE_DEBUG((LM_INFO, ACE_TEXT("allocated shmem block at %@\n"), buf)); |