summaryrefslogtreecommitdiff
path: root/ACE/ace/MMAP_Memory_Pool.cpp
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2009-02-13 13:31:02 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2009-02-13 13:31:02 +0000
commit8bd3b08eb5ea4d76a7f025de00b89c040c056c27 (patch)
tree8cdee4d34eea2e115fdf686776522a440c1bb410 /ACE/ace/MMAP_Memory_Pool.cpp
parent6db2901cb5fb8b7d8f303e199406f603354fa2b4 (diff)
downloadATCD-8bd3b08eb5ea4d76a7f025de00b89c040c056c27.tar.gz
Fri Feb 13 13:30:28 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Dev_Poll_Reactor.cpp * ace/Log_Msg.cpp * ace/MEM_Acceptor.cpp * ace/MMAP_Memory_Pool.cpp * ace/POSIX_Asynch_IO.cpp * ace/POSIX_CB_Proactor.cpp * ace/POSIX_Proactor.cpp * ace/Registry_Name_Space.cpp * ace/Remote_Tokens.cpp * ace/Service_Config.cpp * ace/Service_Gestalt.cpp * ace/Shared_Memory_Pool.cpp * ace/SOCK_Dgram_Bcast.cpp * ace/SUN_Proactor.cpp * ace/TLI.cpp Use ACE_TEXT() with %p in ACE_DEBUG/ACE_ERROR. The log string passed to ACE_DEBUG/ACE_ERROR is converted automatically to unicode in an unicode build. The %p expects an unicode string, if a plain ascii string is passed in, this is just handled as unicode string and could lead to a crash because then we are just reading random memory
Diffstat (limited to 'ACE/ace/MMAP_Memory_Pool.cpp')
-rw-r--r--ACE/ace/MMAP_Memory_Pool.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/ACE/ace/MMAP_Memory_Pool.cpp b/ACE/ace/MMAP_Memory_Pool.cpp
index 02e82dcf4cf..a4109687b04 100644
--- a/ACE/ace/MMAP_Memory_Pool.cpp
+++ b/ACE/ace/MMAP_Memory_Pool.cpp
@@ -198,7 +198,7 @@ ACE_MMAP_Memory_Pool::ACE_MMAP_Memory_Pool (
{
if (this->signal_handler_.register_handler (SIGSEGV, this) == -1)
ACE_ERROR ((LM_ERROR,
- "%p\n", this->backing_store_name_));
+ ACE_TEXT("%p\n"), this->backing_store_name_));
}
#endif /* ACE_WIN32 */
}
@@ -311,12 +311,12 @@ ACE_MMAP_Memory_Pool::map_file (size_t map_size)
{
#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
this->base_addr_ = this->mmap_.addr ();
-
+
if (obase_addr && this->base_addr_ != obase_addr)
{
ACE_BASED_POINTER_REPOSITORY::instance ()->unbind (obase_addr);
}
-
+
ACE_BASED_POINTER_REPOSITORY::instance ()->bind (this->base_addr_,
map_size);
#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */