ACE Configuration Project updates. Synchronized with current

version of ACE in CVS repository.

3 files changed, 33 insertions, 28 deletions

diff --git a/acconfig.h b/acconfig.h
index 28969dfc40b..56cd449c01e 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -14,15 +14,6 @@
   autoheader may encounter.
 */
 
-/* Name of package */
-#ifndef PACKAGE
-# undef PACKAGE
-#endif
-
-/* Version of package */
-#ifndef VERSION
-# undef VERSION
-#endif
 
 /* Define _REENTRANT if reentrant functions should be used. */
 #ifndef _REENTRANT
diff --git a/ace/Makefile.am b/ace/Makefile.am
index 98677f3160e..9aa14849752 100644
--- a/ace/Makefile.am
+++ b/ace/Makefile.am
@@ -286,6 +286,7 @@ libACE_Streams_la_SOURCES = \
         Task.cpp
 
 libACE_Memory_la_SOURCES = \
+	Based_Pointer_Repository.cpp \
         Malloc.cpp \
         Mem_Map.cpp \
         Memory_Pool.cpp \
@@ -383,6 +384,7 @@ ACE_TEMPLATE_FILES = \
         Active_Map_Manager_T.cpp \
         Asynch_Acceptor.cpp \
         Auto_Ptr.cpp \
+	Based_Pointer_T.cpp \
         Connector.cpp \
         Containers_T.cpp \
 	Cache_Map_Manager_T.cpp \
@@ -469,6 +471,9 @@ pkginclude_HEADERS = \
         Atomic_Op.i \
         Auto_Ptr.h \
         Auto_Ptr.i \
+        Based_Pointer_Repository.h \
+        Based_Pointer_T.h \
+        Based_Pointer_T.i \
         Basic_Types.h \
         Basic_Types.i \
         CDR_Stream.h \
@@ -560,8 +565,6 @@ pkginclude_HEADERS = \
         Hash_Map_Manager.i \
         Hash_Map_Manager_T.h \
         Hash_Map_Manager_T.i \
-        Hash_Purgable_Map_Manager_T.h \
-        Hash_Purgable_Map_Manager_T.i \
         High_Res_Timer.h \
         High_Res_Timer.i \
         INET_Addr.h \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6c0d9ba5f09..3474b195f93 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -57,6 +57,7 @@ check_PROGRAMS = \
         Basic_Types_Test \
         Buffer_Stream_Test \
 	Cache_Map_Manager_Test \
+        Cached_Conn_Test \
         CDR_Test \
         Collection_Test \
         Conn_Test \
@@ -67,7 +68,6 @@ check_PROGRAMS = \
         Env_Value_Test \
         Future_Test \
         Handle_Set_Test \
-        Hash_Map_Manager_Test \
         High_Res_Timer_Test \
         IOStream_Test \
         MM_Shared_Memory_Test \
@@ -79,7 +79,6 @@ check_PROGRAMS = \
         Message_Block_Test \
         Message_Queue_Notifications_Test \
         Message_Queue_Test \
-        Naming_Test \
         New_Fail_Test \
         Notify_Performance_Test \
         OrdMultiSet_Test \
@@ -111,15 +110,19 @@ check_PROGRAMS = \
         Task_Test \
         Thread_Manager_Test \
         Thread_Mutex_Test \
-        Thread_Pool_Reactor_Test \
         Thread_Pool_Test \
         Time_Service_Test \
         Time_Value_Test \
         Timeprobe_Test \
         Timer_Queue_Test \
-        Tokens_Test \
         UPIPE_SAP_Test \
-        Upgradable_RW_Test $(XTREACTOR_TEST)
+        Upgradable_RW_Test \
+	\
+	Naming_Test \
+	\
+        FlReactor_Test \
+	Thread_Pool_Reactor_Test \
+        TkReactor_Test $(XTREACTOR_TEST)
 
 Aio_Platform_Test_SOURCES = Aio_Platform_Test.cpp
 
@@ -133,7 +136,12 @@ Buffer_Stream_Test_SOURCES = Buffer_Stream_Test.cpp
 
 CDR_Test_SOURCES = CDR_Test.cpp
 
-Cache_Map_Manager_Test_SOURCES = Cache_Map_Manager_Test.cpp
+# Cached_Accept_Conn_Test_SOURCES = Cached_Accept_Conn_Test.cpp
+
+Cached_Conn_Test_SOURCES = Cached_Conn_Test.cpp
+
+Cache_Map_Manager_Test_SOURCES = Cache_Map_Manager_Test.cpp \
+                                 Cache_Map_Manager_Test.h
 
 Collection_Test_SOURCES = Collection_Test.cpp
 
@@ -149,12 +157,12 @@ Enum_Interfaces_Test_SOURCES = Enum_Interfaces_Test.cpp
 
 Env_Value_Test_SOURCES = Env_Value_Test.cpp
 
+FlReactor_Test_SOURCES = FlReactor_Test.cpp
+
 Future_Test_SOURCES = Future_Test.cpp
 
 Handle_Set_Test_SOURCES = Handle_Set_Test.cpp
 
-Hash_Map_Manager_Test_SOURCES = Hash_Map_Manager_Test.cpp
-
 High_Res_Timer_Test_SOURCES = High_Res_Timer_Test.cpp
 
 IOStream_Test_SOURCES = IOStream_Test.cpp
@@ -202,7 +210,7 @@ Process_Strategy_Test_SOURCES = Process_Strategy_Test.cpp \
 
 # Purgable_Map_Manager_Test_SOURCES = Purgable_Map_Manager_Test.cpp
 
-RB_Tree_Test_SOURCES = RB_Tree_Test.cpp
+RB_Tree_Test_SOURCES = RB_Tree_Test.cpp RB_Tree_Test.h
 
 Reactor_Exceptions_Test_SOURCES = Reactor_Exceptions_Test.cpp
 
@@ -261,7 +269,7 @@ Timeprobe_Test_SOURCES = Timeprobe_Test.cpp
 
 Timer_Queue_Test_SOURCES = Timer_Queue_Test.cpp
 
-Tokens_Test_SOURCES = Tokens_Test.cpp
+TkReactor_Test_SOURCES = TkReactor_Test.cpp
 
 UPIPE_SAP_Test_SOURCES = UPIPE_SAP_Test.cpp
 
@@ -275,12 +283,15 @@ XtReactor_Test_LDADD = $(top_builddir)/ace/libACE.la @XTREACTOR_TEST_XLIBS@
 noinst_HEADERS = test_config.h
 
 ## Architecture independent data files
-noinst_DATA = UNIXserver.conf \
-              UNIXclerk.conf \
-              UNIXtokens.conf \
-              Win32server.conf \
-              Win32clerk.conf \
-              Win32tokens.conf
+noinst_DATA = \
+	TkReactor_Test.tcl \
+	\
+	UNIXserver.conf \
+        UNIXclerk.conf \
+        UNIXtokens.conf \
+        Win32server.conf \
+        Win32clerk.conf \
+        Win32tokens.conf
 
 
 ## The tests we want to run are all of the test programs we are going to build.
@@ -288,7 +299,7 @@ noinst_DATA = UNIXserver.conf \
 if ACE_CROSS_COMPILED
 TESTS =
 else
-TESTS = $(noinst_PROGRAMS)
+TESTS = $(check_PROGRAMS)
 endif
 
 ## Set up the test environment