ChangeLogTag:Fri May 7 17:26:33 2004 Steve Huston <shuston@riverace.com>

21 files changed, 69 insertions, 4 deletions

diff --git a/ASNMP/asnmp/sagent.h b/ASNMP/asnmp/sagent.h
index 5498e865e04..ced6bb4fff5 100644
--- a/ASNMP/asnmp/sagent.h
+++ b/ASNMP/asnmp/sagent.h
@@ -39,7 +39,7 @@
 
 #define DEF_AGENT_PORT (161)
 
-class ASNMP_Export sagent : public ACE_Event_Handler, Snmp
+class ASNMP_Export sagent : public ACE_Event_Handler, private Snmp
   // = TITLE
   //      Concrete class sagent defines the session and interface to
   //      communicate with another SNMP Version 1 manager
diff --git a/ChangeLog b/ChangeLog
index 0200fb56178..85530cdf672 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
+Fri May  7 17:26:33 2004  Steve Huston  <shuston@riverace.com>
+
+	* include/makeinclude/platform_aix_ibm.GNU: Changed the rtti default
+	  to 1 and changed the associated -qrtti option from dynamiccast to
+	  all since some parts of ACE use type IDs.
+
+	* ASNMP/asnmp/sagent.h: Added implied keyword "private" to sagent's
+	  derivation. Quiets a warning from Visual Age C++.
+
+	* apps/JAWS3/jaws3/Event_Dispatcher.cpp: Added #include
+	  "ace/Log_Msg.h" to pick up logging macros. Removed #include
+	  "ace/OS.h".
+
+	* examples/Reactor/Proactor/test_cancel.cpp:
+	* examples/Reactor/Proactor/test_proactor.cpp:
+	* examples/Reactor/Proactor/test_udp_proactor.cpp:
+	* performance-tests/Synch-Benchmarks/synch_driver.cpp:
+	* performance-tests/Synch-Benchmarks/Perf_Test/adaptive_mutex_test.cpp:
+	* performance-tests/Synch-Benchmarks/Perf_Test/adaptive_recursive_lock_test.cpp:
+	* performance-tests/Synch-Benchmarks/Perf_Test/adaptive_sema_test.cpp:
+	* performance-tests/Synch-Benchmarks/Perf_Test/pipe_proc_test.cpp:
+	* performance-tests/Synch-Benchmarks/Perf_Test/pipe_thr_test.cpp:
+	* performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp:
+	* performance-tests/Synch-Benchmarks/Base_Test/base_test.cpp:
+	* performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp:
+	  Added #include for OS_NS_*.h methods and/or "ace/Log_Msg.h" to
+	  pick up logging macros.
+
+	* performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp: Added
+	  #include "ace/Guard_T.h" to see ACE_GUARD macros and classes.
+
+	* performance-tests/Synch-Benchmarks/Perf_Test/memory_test.cpp: Added
+	  #include "ace/OS_NS_string.h" to see ACE_OS stuff.
+
+	* performance-tests/Synch-Benchmarks/Perf_Test/recursive_lock_test.cpp:
+	  Added #include "ace/Recursive_Thread_Mutex.h" to find that class.
+
+	* performance-tests/Synch-Benchmarks/Perf_Test/rwrd_test.cpp:
+	* performance-tests/Synch-Benchmarks/Perf_Test/rwwr_test.cpp: Added
+	  #include "ace/RW_Mutex.h" to find that class.
+
+
 Fri May  7 14:25:07 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
 	* ace/Log_Msg.cpp:
diff --git a/apps/JAWS3/jaws3/Event_Dispatcher.cpp b/apps/JAWS3/jaws3/Event_Dispatcher.cpp
index 82bc883f774..6b498e23125 100644
--- a/apps/JAWS3/jaws3/Event_Dispatcher.cpp
+++ b/apps/JAWS3/jaws3/Event_Dispatcher.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "ace/OS.h"
+#include "ace/Log_Msg.h"
 #include "ace/Thread.h"
 #include "ace/Reactor.h"
 #include "ace/Proactor.h"
diff --git a/examples/Reactor/Proactor/test_cancel.cpp b/examples/Reactor/Proactor/test_cancel.cpp
index 74fe8835fb4..40afef16dba 100644
--- a/examples/Reactor/Proactor/test_cancel.cpp
+++ b/examples/Reactor/Proactor/test_cancel.cpp
@@ -47,6 +47,7 @@
 #include "ace/SOCK_Stream.h"
 #include "ace/Message_Block.h"
 #include "ace/Get_Opt.h"
+#include "ace/Log_Msg.h"
 
 ACE_RCSID (Proactor, test_proactor, "$Id$")
 
diff --git a/examples/Reactor/Proactor/test_proactor.cpp b/examples/Reactor/Proactor/test_proactor.cpp
index 6c60d439c36..837853ace27 100644
--- a/examples/Reactor/Proactor/test_proactor.cpp
+++ b/examples/Reactor/Proactor/test_proactor.cpp
@@ -31,6 +31,7 @@
 #include "ace/SOCK_Stream.h"
 #include "ace/Message_Block.h"
 #include "ace/Get_Opt.h"
+#include "ace/Log_Msg.h"
 #include "ace/OS_NS_sys_stat.h"
 
 
diff --git a/examples/Reactor/Proactor/test_udp_proactor.cpp b/examples/Reactor/Proactor/test_udp_proactor.cpp
index 71d89b96dca..bffb9acbaf7 100644
--- a/examples/Reactor/Proactor/test_udp_proactor.cpp
+++ b/examples/Reactor/Proactor/test_udp_proactor.cpp
@@ -27,6 +27,7 @@
 #include "ace/SOCK_Dgram.h"
 #include "ace/Message_Block.h"
 #include "ace/Get_Opt.h"
+#include "ace/Log_Msg.h"
 
 ACE_RCSID(Proactor, test_udp_proactor, "test_proactor.cpp,v 1.29 2001/02/02 23:41:16 shuston Exp")
 
diff --git a/include/makeinclude/platform_aix_ibm.GNU b/include/makeinclude/platform_aix_ibm.GNU
index e4ed5d85a2f..eb6ece1fc46 100644
--- a/include/makeinclude/platform_aix_ibm.GNU
+++ b/include/makeinclude/platform_aix_ibm.GNU
@@ -26,7 +26,7 @@ else
 endif
 endif
 ifeq (,$(rtti))
-  rtti = 0
+  rtti = 1
 endif
 ifeq (,$(threads))
   threads = 1
@@ -149,7 +149,7 @@ ifeq ($(exceptions),0)
 endif
 
 ifeq (1,$(rtti))
-  CCFLAGS += -qrtti=dynamiccast
+  CCFLAGS += -qrtti=all
 else  # ! rtti
   CCFLAGS += -DACE_LACKS_RTTI
 endif # ! rtti
diff --git a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp b/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp
index 120768ffadb..33b69a8324e 100644
--- a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp
+++ b/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #define  ACE_BUILD_SVC_DLL
+#include "ace/OS_NS_unistd.h"
 #include "ace/Service_Repository.h"
 #include "ace/Get_Opt.h"
 #include "ace/Thread_Manager.h"
diff --git a/performance-tests/Synch-Benchmarks/Base_Test/base_test.cpp b/performance-tests/Synch-Benchmarks/Base_Test/base_test.cpp
index f0b06b3bf06..67bbf81134c 100644
--- a/performance-tests/Synch-Benchmarks/Base_Test/base_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Base_Test/base_test.cpp
@@ -2,6 +2,7 @@
 
 #define ACE_BUILD_SVC_DLL
 
+#include "ace/Log_Msg.h"
 #include "Baseline_Test.h"
 
 class ACE_Svc_Export Baseline_Base_Test : public Baseline_Test_Base
diff --git a/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp b/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp
index 4507a5d9c04..b37415ce9d3 100644
--- a/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp
@@ -2,9 +2,12 @@
 
 #define ACE_BUILD_SVC_DLL
 
+#include "ace/Log_Msg.h"
 #include "ace/Token.h"
 #include "ace/Process_Mutex.h"
+#include "ace/RW_Mutex.h"
 #include "ace/RW_Process_Mutex.h"
+#include "ace/RW_Thread_Mutex.h"
 #include "ace/Lock_Adapter_T.h"
 #include "ace/Recursive_Thread_Mutex.h"
 #include "ace/Semaphore.h"
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_mutex_test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_mutex_test.cpp
index cc28443533a..4a72ec2ac90 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_mutex_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_mutex_test.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #define  ACE_BUILD_SVC_DLL
+#include "ace/Log_Msg.h"
 #include "Adaptive_Lock_Performance_Test_Base.h"
 #include "ace/Lock_Adapter_T.h"
 
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_recursive_lock_test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_recursive_lock_test.cpp
index e332abd5bd4..a439127e9c4 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_recursive_lock_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_recursive_lock_test.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #define  ACE_BUILD_SVC_DLL
+#include "ace/Log_Msg.h"
 #include "Adaptive_Lock_Performance_Test_Base.h"
 #include "ace/Lock_Adapter_T.h"
 #include "ace/Recursive_Thread_Mutex.h"
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_sema_test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_sema_test.cpp
index 1320a5f0c69..605d4ffb338 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_sema_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_sema_test.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #define  ACE_BUILD_SVC_DLL
+#include "ace/Log_Msg.h"
 #include "Adaptive_Lock_Performance_Test_Base.h"
 #include "ace/Semaphore.h"
 #include "ace/Lock_Adapter_T.h"
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp
index c59fd47ade6..e1824f3d4ac 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp
@@ -1,6 +1,8 @@
 // $Id$
 
 #define  ACE_BUILD_SVC_DLL
+#include "ace/Guard_T.h"
+#include "ace/Log_Msg.h"
 #include "Performance_Test_Options.h"
 #include "Benchmark_Performance.h"
 
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/memory_test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/memory_test.cpp
index 5faa976a506..9d0bcd6c7d1 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/memory_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/memory_test.cpp
@@ -1,6 +1,8 @@
 // $Id$
 
 #define  ACE_BUILD_SVC_DLL
+#include "ace/OS_NS_string.h"
+#include "ace/Log_Msg.h"
 #include "Performance_Test_Options.h"
 #include "Benchmark_Performance.h"
 
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/pipe_proc_test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/pipe_proc_test.cpp
index 2c1b31e90dc..10bed9b88f3 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/pipe_proc_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/pipe_proc_test.cpp
@@ -1,6 +1,8 @@
 // $Id$
 
 #define  ACE_BUILD_SVC_DLL
+#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_unistd.h"
 #include "Performance_Test_Options.h"
 #include "Benchmark_Performance.h"
 
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/pipe_thr_test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/pipe_thr_test.cpp
index 12c0847436b..895b5a846fe 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/pipe_thr_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/pipe_thr_test.cpp
@@ -1,6 +1,8 @@
 // $Id$
 
 #define  ACE_BUILD_SVC_DLL
+#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_unistd.h"
 #include "ace/Thread_Manager.h"
 #include "Performance_Test_Options.h"
 #include "Benchmark_Performance.h"
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/recursive_lock_test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/recursive_lock_test.cpp
index 69949272b9d..6246835ee88 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/recursive_lock_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/recursive_lock_test.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #define  ACE_BUILD_SVC_DLL
+#include "ace/Recursive_Thread_Mutex.h"
 #include "Performance_Test_Options.h"
 #include "Benchmark_Performance.h"
 
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/rwrd_test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/rwrd_test.cpp
index 66b0c6213ca..a0eb5c6cff8 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/rwrd_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/rwrd_test.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #define  ACE_BUILD_SVC_DLL
+#include "ace/RW_Mutex.h"
 #include "Performance_Test_Options.h"
 #include "Benchmark_Performance.h"
 
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/rwwr_test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/rwwr_test.cpp
index d44baf6dd7a..1c7a25eae1f 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/rwwr_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/rwwr_test.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #define  ACE_BUILD_SVC_DLL
+#include "ace/RW_Mutex.h"
 #include "Performance_Test_Options.h"
 #include "Benchmark_Performance.h"
 
diff --git a/performance-tests/Synch-Benchmarks/synch_driver.cpp b/performance-tests/Synch-Benchmarks/synch_driver.cpp
index 4df951a36f1..eca2f6cecb0 100644
--- a/performance-tests/Synch-Benchmarks/synch_driver.cpp
+++ b/performance-tests/Synch-Benchmarks/synch_driver.cpp
@@ -3,6 +3,7 @@
 // Driver program that measures the performance of synchronization
 // mechanisms provided by ACE and the underlying OS.
 
+#include "ace/Log_Msg.h"
 #include "ace/Service_Config.h"
 #include "ace/Service_Repository.h"
 #include "Synch_Lib/Benchmark_Base.h"