summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ace/Local_Name_Space.cpp2
-rw-r--r--ace/Local_Name_Space_T.cpp68
-rw-r--r--ace/Local_Name_Space_T.h4
-rw-r--r--ace/Memory_Pool.cpp2
-rw-r--r--ace/Naming_Context.cpp18
-rw-r--r--ace/OS.h2
-rw-r--r--ace/Service_Config.cpp7
-rw-r--r--ace/System_Time.cpp4
-rw-r--r--ace/System_Time.h2
9 files changed, 55 insertions, 54 deletions
diff --git a/ace/Local_Name_Space.cpp b/ace/Local_Name_Space.cpp
index 444e7507a13..878f015f609 100644
--- a/ace/Local_Name_Space.cpp
+++ b/ace/Local_Name_Space.cpp
@@ -146,7 +146,7 @@ template class ACE_Set_Node<ACE_Name_Binding>;
template class ACE_Guard<ACE_RW_Process_Mutex>;
template class ACE_Read_Guard<ACE_RW_Process_Mutex>;
template class ACE_Write_Guard<ACE_RW_Process_Mutex>;
-template class ACE_Malloc<ACE_MMAP_Memory_Pool, ACE_RW_Process_Mutex>;
+template class ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex>;
template class ACE_Map_Manager<ACE_NS_String, ACE_NS_Internal, ACE_Null_Mutex>;
template class ACE_Map_Iterator<ACE_NS_String, ACE_NS_Internal, ACE_Null_Mutex>;
template class ACE_Map_Entry <ACE_NS_String, ACE_NS_Internal>;
diff --git a/ace/Local_Name_Space_T.cpp b/ace/Local_Name_Space_T.cpp
index 2a03ef5a338..41c7e19db94 100644
--- a/ace/Local_Name_Space_T.cpp
+++ b/ace/Local_Name_Space_T.cpp
@@ -137,8 +137,8 @@ ACE_Name_Space_Map<ALLOCATOR>::find (const ACE_NS_String &ext_id,
return result;
}
-template <class MEM_POOL, class LOCK> int
-ACE_Local_Name_Space<MEM_POOL, LOCK>::shared_bind (const ACE_WString &name,
+template <ACE_MEM_POOL_1, class LOCK> int
+ACE_Local_Name_Space<ACE_MEM_POOL_2, LOCK>::shared_bind (const ACE_WString &name,
const ACE_WString &value,
const char *type,
int rebind)
@@ -210,8 +210,8 @@ ACE_Local_Name_Space<MEM_POOL, LOCK>::shared_bind (const ACE_WString &name,
}
}
-template <class MEM_POOL, class LOCK> int
-ACE_Local_Name_Space<MEM_POOL, LOCK>::unbind (const ACE_WString &name)
+template <ACE_MEM_POOL_1, class LOCK> int
+ACE_Local_Name_Space<ACE_MEM_POOL_2, LOCK>::unbind (const ACE_WString &name)
{
ACE_TRACE ("ACE_Local_Name_Space::unbind");
@@ -231,8 +231,8 @@ ACE_Local_Name_Space<MEM_POOL, LOCK>::unbind (const ACE_WString &name)
}
}
-template <class MEM_POOL, class LOCK> int
-ACE_Local_Name_Space<MEM_POOL, LOCK>::bind (const ACE_WString &name,
+template <ACE_MEM_POOL_1, class LOCK> int
+ACE_Local_Name_Space<ACE_MEM_POOL_2, LOCK>::bind (const ACE_WString &name,
const ACE_WString &value,
const char *type)
{
@@ -242,8 +242,8 @@ ACE_Local_Name_Space<MEM_POOL, LOCK>::bind (const ACE_WString &name,
return this->shared_bind (name, value, type, 0);
}
-template <class MEM_POOL, class LOCK> int
-ACE_Local_Name_Space<MEM_POOL, LOCK>::rebind (const ACE_WString &name,
+template <ACE_MEM_POOL_1, class LOCK> int
+ACE_Local_Name_Space<ACE_MEM_POOL_2, LOCK>::rebind (const ACE_WString &name,
const ACE_WString &value,
const char *type)
{
@@ -253,8 +253,8 @@ ACE_Local_Name_Space<MEM_POOL, LOCK>::rebind (const ACE_WString &name,
return this->shared_bind (name, value, type, 1);
}
-template <class MEM_POOL, class LOCK> int
-ACE_Local_Name_Space<MEM_POOL, LOCK>::resolve (const ACE_WString &name,
+template <ACE_MEM_POOL_1, class LOCK> int
+ACE_Local_Name_Space<ACE_MEM_POOL_2, LOCK>::resolve (const ACE_WString &name,
ACE_WString &value,
char *&type)
{
@@ -290,8 +290,8 @@ ACE_Local_Name_Space<MEM_POOL, LOCK>::resolve (const ACE_WString &name,
}
}
-template <class MEM_POOL, class LOCK> int
-ACE_Local_Name_Space<MEM_POOL, LOCK>::open (ACE_Naming_Context::Context_Scope_Type scope_in)
+template <ACE_MEM_POOL_1, class LOCK> int
+ACE_Local_Name_Space<ACE_MEM_POOL_2, LOCK>::open (ACE_Naming_Context::Context_Scope_Type scope_in)
{
ACE_TRACE ("ACE_Local_Name_Space::open");
this->ns_scope_ = scope_in;
@@ -299,8 +299,8 @@ ACE_Local_Name_Space<MEM_POOL, LOCK>::open (ACE_Naming_Context::Context_Scope_Ty
return this->create_manager ();
}
-template <class MEM_POOL, class LOCK>
-ACE_Local_Name_Space<MEM_POOL, LOCK>::ACE_Local_Name_Space (void)
+template <ACE_MEM_POOL_1, class LOCK>
+ACE_Local_Name_Space<ACE_MEM_POOL_2, LOCK>::ACE_Local_Name_Space (void)
: name_space_map_ (0),
name_options_ (0),
allocator_ (0)
@@ -308,8 +308,8 @@ ACE_Local_Name_Space<MEM_POOL, LOCK>::ACE_Local_Name_Space (void)
ACE_TRACE ("ACE_Local_Name_Space::ACE_Local_Name_Space");
}
-template <class MEM_POOL, class LOCK>
-ACE_Local_Name_Space<MEM_POOL, LOCK>::ACE_Local_Name_Space (ACE_Naming_Context::Context_Scope_Type scope_in,
+template <ACE_MEM_POOL_1, class LOCK>
+ACE_Local_Name_Space<ACE_MEM_POOL_2, LOCK>::ACE_Local_Name_Space (ACE_Naming_Context::Context_Scope_Type scope_in,
ACE_Name_Options *name_options)
: name_options_ (name_options)
{
@@ -318,8 +318,8 @@ ACE_Local_Name_Space<MEM_POOL, LOCK>::ACE_Local_Name_Space (ACE_Naming_Context::
ACE_ERROR ((LM_ERROR, "%p\n", "ACE_Local_Name_Space::ACE_Local_Name_Space"));
}
-template <class MEM_POOL, class LOCK>
-ACE_Local_Name_Space<MEM_POOL, LOCK>::~ACE_Local_Name_Space (void)
+template <ACE_MEM_POOL_1, class LOCK>
+ACE_Local_Name_Space<ACE_MEM_POOL_2, LOCK>::~ACE_Local_Name_Space (void)
{
ACE_TRACE ("ACE_Local_Name_Space::~ACE_Local_Name_Space");
@@ -327,8 +327,8 @@ ACE_Local_Name_Space<MEM_POOL, LOCK>::~ACE_Local_Name_Space (void)
delete this->allocator_;
}
-template <class MEM_POOL, class LOCK> int
-ACE_Local_Name_Space<MEM_POOL, LOCK>::create_manager (void)
+template <ACE_MEM_POOL_1, class LOCK> int
+ACE_Local_Name_Space<ACE_MEM_POOL_2, LOCK>::create_manager (void)
{
ACE_TRACE ("ACE_Local_Name_Space::create_manager");
// Get directory name
@@ -408,8 +408,8 @@ ACE_Local_Name_Space<MEM_POOL, LOCK>::create_manager (void)
return 0;
}
-template <class MEM_POOL, class LOCK> int
-ACE_Local_Name_Space<MEM_POOL, LOCK>::list_names (ACE_PWSTRING_SET &set,
+template <ACE_MEM_POOL_1, class LOCK> int
+ACE_Local_Name_Space<ACE_MEM_POOL_2, LOCK>::list_names (ACE_PWSTRING_SET &set,
const ACE_WString &pattern)
{
ACE_TRACE ("ACE_Local_Name_Space::list_names");
@@ -441,8 +441,8 @@ ACE_Local_Name_Space<MEM_POOL, LOCK>::list_names (ACE_PWSTRING_SET &set,
return result;
}
-template <class MEM_POOL, class LOCK> int
-ACE_Local_Name_Space<MEM_POOL, LOCK>::list_values (ACE_PWSTRING_SET &set,
+template <ACE_MEM_POOL_1, class LOCK> int
+ACE_Local_Name_Space<ACE_MEM_POOL_2, LOCK>::list_values (ACE_PWSTRING_SET &set,
const ACE_WString &pattern)
{
ACE_TRACE ("ACE_Local_Name_Space::list_values");
@@ -474,8 +474,8 @@ ACE_Local_Name_Space<MEM_POOL, LOCK>::list_values (ACE_PWSTRING_SET &set,
return result;
}
-template <class MEM_POOL, class LOCK> int
-ACE_Local_Name_Space<MEM_POOL, LOCK>::list_types (ACE_PWSTRING_SET &set,
+template <ACE_MEM_POOL_1, class LOCK> int
+ACE_Local_Name_Space<ACE_MEM_POOL_2, LOCK>::list_types (ACE_PWSTRING_SET &set,
const ACE_WString &pattern)
{
ACE_TRACE ("ACE_Local_Name_Space::list_types");
@@ -536,8 +536,8 @@ ACE_Local_Name_Space<MEM_POOL, LOCK>::list_types (ACE_PWSTRING_SET &set,
return result;
}
-template <class MEM_POOL, class LOCK> int
-ACE_Local_Name_Space <MEM_POOL, LOCK>::list_name_entries (ACE_BINDING_SET &set,
+template <ACE_MEM_POOL_1, class LOCK> int
+ACE_Local_Name_Space <ACE_MEM_POOL_2, LOCK>::list_name_entries (ACE_BINDING_SET &set,
const ACE_WString &pattern)
{
ACE_TRACE ("ACE_Local_Name_Space::list_name_entries");
@@ -564,8 +564,8 @@ ACE_Local_Name_Space <MEM_POOL, LOCK>::list_name_entries (ACE_BINDING_SET &set,
return 0;
}
-template <class MEM_POOL, class LOCK> int
-ACE_Local_Name_Space<MEM_POOL, LOCK>::list_value_entries (ACE_BINDING_SET &set,
+template <ACE_MEM_POOL_1, class LOCK> int
+ACE_Local_Name_Space<ACE_MEM_POOL_2, LOCK>::list_value_entries (ACE_BINDING_SET &set,
const ACE_WString &pattern)
{
ACE_TRACE ("ACE_Local_Name_Space::list_value_entries");
@@ -591,8 +591,8 @@ ACE_Local_Name_Space<MEM_POOL, LOCK>::list_value_entries (ACE_BINDING_SET &set,
return 0;
}
-template <class MEM_POOL, class LOCK> int
-ACE_Local_Name_Space<MEM_POOL, LOCK>::list_type_entries (ACE_BINDING_SET &set,
+template <ACE_MEM_POOL_1, class LOCK> int
+ACE_Local_Name_Space<ACE_MEM_POOL_2, LOCK>::list_type_entries (ACE_BINDING_SET &set,
const ACE_WString &pattern)
{
ACE_TRACE ("ACE_Local_Name_Space::list_type_entries");
@@ -649,8 +649,8 @@ ACE_Local_Name_Space<MEM_POOL, LOCK>::list_type_entries (ACE_BINDING_SET &set,
}
-template <class MEM_POOL, class LOCK> void
-ACE_Local_Name_Space<MEM_POOL, LOCK>::dump (void) const
+template <ACE_MEM_POOL_1, class LOCK> void
+ACE_Local_Name_Space<ACE_MEM_POOL_2, LOCK>::dump (void) const
{
ACE_TRACE ("ACE_Local_Name_Space::dump");
diff --git a/ace/Local_Name_Space_T.h b/ace/Local_Name_Space_T.h
index ada018f91c7..cb62e065d08 100644
--- a/ace/Local_Name_Space_T.h
+++ b/ace/Local_Name_Space_T.h
@@ -85,7 +85,7 @@ private:
#endif /* ACE_WIN32 */
};
-template <class MEM_POOL, class LOCK>
+template <ACE_MEM_POOL_1, class LOCK>
class ACE_Local_Name_Space : public ACE_Name_Space
// = TITLE
// Maintaining accesses Local Name Server Database. Allows to
@@ -187,7 +187,7 @@ private:
// key/value binding.
// = I just know this is going to cause problems on some platform...
- typedef ACE_Allocator_Adapter <ACE_Malloc <MEM_POOL, LOCK> > ALLOCATOR;
+ typedef ACE_Allocator_Adapter <ACE_Malloc <ACE_MEM_POOL_2, LOCK> > ALLOCATOR;
ALLOCATOR *allocator_;
// Pointer to the allocator
diff --git a/ace/Memory_Pool.cpp b/ace/Memory_Pool.cpp
index 6224420cf7d..387d7b57a55 100644
--- a/ace/Memory_Pool.cpp
+++ b/ace/Memory_Pool.cpp
@@ -109,7 +109,7 @@ ACE_MMAP_Memory_Pool::protect (void *addr, size_t len, int prot)
}
ACE_MMAP_Memory_Pool::ACE_MMAP_Memory_Pool (const char *pool_name)
- : base_addr_ (ACE_DEFAULT_BACKING_STORE),
+ : base_addr_ (ACE_DEFAULT_BASE_ADDR),
flags_ (MAP_SHARED | MAP_FIXED),
write_each_page_ (1)
{
diff --git a/ace/Naming_Context.cpp b/ace/Naming_Context.cpp
index 356c041cfde..ce94ea1d12d 100644
--- a/ace/Naming_Context.cpp
+++ b/ace/Naming_Context.cpp
@@ -10,8 +10,8 @@
// Make life easier later on...
-typedef ACE_Local_Name_Space <ACE_MMAP_Memory_Pool, ACE_RW_Process_Mutex> LOCAL_NAME_SPACE;
-typedef ACE_Local_Name_Space <ACE_Lite_MMAP_Memory_Pool, ACE_RW_Process_Mutex> LIGHT_LOCAL_NAME_SPACE;
+typedef ACE_Local_Name_Space <ACE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex> LOCAL_NAME_SPACE;
+typedef ACE_Local_Name_Space <ACE_LITE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex> LIGHT_LOCAL_NAME_SPACE;
// The following Factory is used by the ACE_Service_Config and
// svc.conf file to dynamically initialize the state of the Name
@@ -520,7 +520,7 @@ ACE_Name_Options::parse_args (int argc, char *argv[])
this->database (get_opt.optarg);
break;
case 'b':
- this->base_address (ACE_OS::atoi (get_opt.optarg));
+ this->base_address ((char *) ACE_OS::atoi (get_opt.optarg));
break;
case 'T':
if (ACE_OS::strcasecmp (get_opt.optarg, "ON") == 0)
@@ -548,10 +548,10 @@ ACE_Name_Options::parse_args (int argc, char *argv[])
}
#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_Local_Name_Space <ACE_MMAP_Memory_Pool, ACE_RW_Process_Mutex>;
-template class ACE_Local_Name_Space <ACE_Lite_MMAP_Memory_Pool, ACE_RW_Process_Mutex>;
-template class ACE_Allocator_Adapter<ACE_Malloc<ACE_MMAP_Memory_Pool, ACE_RW_Process_Mutex> >;
-template class ACE_Allocator_Adapter<ACE_Malloc<ACE_Lite_MMAP_Memory_Pool, ACE_RW_Process_Mutex> >;
-ACE_Name_Space_Map <ACE_Allocator_Adapter <ACE_Malloc <ACE_MMAP_Memory_Pool, ACE_RW_Process_Mutex> > >;
-ACE_Name_Space_Map <ACE_Allocator_Adapter <ACE_Malloc <ACE_Lite_MMAP_Memory_Pool, ACE_RW_Process_Mutex> > >;
+template class ACE_Local_Name_Space <ACE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex>;
+template class ACE_Local_Name_Space <ACE_Lite_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex>;
+template class ACE_Allocator_Adapter<ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex> >;
+template class ACE_Allocator_Adapter<ACE_Malloc<ACE_LITE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex> >;
+ACE_Name_Space_Map <ACE_Allocator_Adapter <ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex> > >;
+ACE_Name_Space_Map <ACE_Allocator_Adapter <ACE_Malloc <ACE_LITE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex> > >;
#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/ace/OS.h b/ace/OS.h
index 1c9fbe9191d..82ec314c1a1 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -167,6 +167,7 @@
// Handle ACE_*_Memory_Pool.
#define ACE_MMAP_MEMORY_POOL ACE_MMAP_Memory_Pool
+#define ACE_LITE_MMAP_MEMORY_POOL ACE_Lite_MMAP_Memory_Pool
#define ACE_SBRK_MEMORY_POOL ACE_Sbrk_Memory_Pool
#define ACE_SHARED_MEMORY_POOL ACE_Shared_Memory_Pool
#define ACE_LOCAL_MEMORY_POOL ACE_Local_Memory_Pool
@@ -213,6 +214,7 @@
// Handle ACE_*_Memory_Pool.
#define ACE_MMAP_MEMORY_POOL ACE_MMAP_Memory_Pool, ACE_MMAP_Memory_Pool_Options
+#define ACE_LITE_MMAP_MEMORY_POOL ACE_Lite_MMAP_Memory_Pool, ACE_MMAP_Memory_Pool_Options
#define ACE_SBRK_MEMORY_POOL ACE_Sbrk_Memory_Pool, ACE_Sbrk_Memory_Pool_Options
#define ACE_SHARED_MEMORY_POOL ACE_Shared_Memory_Pool, ACE_Shared_Memory_Pool_Options
#define ACE_LOCAL_MEMORY_POOL ACE_Local_Memory_Pool, ACE_Local_Memory_Pool_Options
diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp
index 991ea1f9d76..36d1ec40672 100644
--- a/ace/Service_Config.cpp
+++ b/ace/Service_Config.cpp
@@ -88,8 +88,7 @@ ACE_ReactorEx *ACE_Service_Config::reactorEx_ = 0;
int ACE_Service_Config::delete_reactorEx_ = 0;
// Make this the default.
-typedef ACE_Malloc <ACE_Local_Memory_Pool, ACE_Null_Mutex>
- ACE_DEFAULT_MALLOC;
+typedef ACE_Malloc <ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex> ACE_DEFAULT_MALLOC;
// Terminate the eventloop.
/* static */
@@ -917,8 +916,8 @@ ACE_Service_Config::reconfig_occurred (sig_atomic_t config_occurred)
template class ACE_Set_Node<ACE_Static_Svc_Descriptor *>;
template class ACE_Unbounded_Set<ACE_Static_Svc_Descriptor *>;
template class ACE_Unbounded_Set_Iterator<ACE_Static_Svc_Descriptor *>;
-template class ACE_Malloc<ACE_Local_Memory_Pool, ACE_Null_Mutex>;
-template class ACE_Allocator_Adapter<ACE_Malloc<ACE_Local_Memory_Pool, ACE_Null_Mutex> >;
+template class ACE_Malloc<ACE_Local_MEMORY_POOL, ACE_Null_Mutex>;
+template class ACE_Allocator_Adapter<ACE_Malloc<ACE_Local_MEMORY_POOL, ACE_Null_Mutex> >;
template class auto_ptr<ACE_Obstack>;
#if !defined (ACE_HAS_THREADS)
template class ACE_Guard<ACE_Null_Mutex>;
diff --git a/ace/System_Time.cpp b/ace/System_Time.cpp
index 14a13a9939f..4c38e951aac 100644
--- a/ace/System_Time.cpp
+++ b/ace/System_Time.cpp
@@ -81,6 +81,6 @@ ACE_System_Time::sync_local_system_time (ACE_System_Time::Sync_Mode mode)
}
#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_Malloc<ACE_MMAP_Memory_Pool, ACE_Null_Mutex>;
-template class ACE_Allocator_Adapter<ACE_Malloc<ACE_MMAP_Memory_Pool, ACE_Null_Mutex> >;
+template class ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex>;
+template class ACE_Allocator_Adapter<ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex> >;
#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/ace/System_Time.h b/ace/System_Time.h
index c8c1035fe03..2e3f2cab101 100644
--- a/ace/System_Time.h
+++ b/ace/System_Time.h
@@ -60,7 +60,7 @@ public:
// specified mode.
private:
- typedef ACE_Malloc <ACE_MMAP_Memory_Pool, ACE_Null_Mutex> MALLOC;
+ typedef ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex> MALLOC;
typedef ACE_Allocator_Adapter<MALLOC> ALLOCATOR;
ALLOCATOR *shmem_;
View Lorry Controller Status