*** empty log message ***

13 files changed, 31 insertions, 7 deletions

diff --git a/ChangeLog-98b b/ChangeLog-98b
index 25863d6d89a..598fb907a5a 100644
--- a/ChangeLog-98b
+++ b/ChangeLog-98b
@@ -1,3 +1,12 @@
+Mon Sep  7 10:06:54 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* ace/ACE.h (ACE): Moved strnew (wchar_t *) into an ACE_WIN32
+ 	  section to protect it properly.  Thanks to David Levine for
+ 	  reporting this.
+
+	* ace:config-sco-*.h: Added ACE_HAS_DIRENT on the advice of Arturo
+ 	  Montes <mitosys@colomsat.com.co>.
+
 Mon Sep 07 09:52:12 1998  David L. Levine  <levine@cs.wustl.edu>
 
         * docs/ACE-guidelines.html: added general rule to put system
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 9f896de051c..211ee77c3e5 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,8 @@
+Mon Sep  7 10:22:19 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* tests/Cubit/TAO/MT_Cubit: Fixed a bunch of warnings.  Thanks to
+ 	  David Levine for reporting this.
+
 Mon Sep 07 09:37:07 1998  David L. Levine  <levine@cs.wustl.edu>
 
         * orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp (TAO_ECG_UDP_Sender::push):
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
index 349006abbac..ba11f80afd2 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
@@ -126,7 +126,7 @@ MT_Priority::get_low_priority (u_int num_low_priority,
                                ACE_Sched_Priority prev_priority,
                                u_int use_multiple_priority)
 {
-  ACE_Sched_Priority low_priority;
+  ACE_Sched_Priority low_priority = ACE_THR_PRI_FIFO_DEF;
 
   // Drop the priority.
   if (use_multiple_priority)
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
index cdbd244a288..2a87a589794 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
@@ -434,6 +434,8 @@ Client_i::activate_low_client (ACE_Thread_Manager *thread_manager)
               (ACE_SCHED_FIFO, this->low_priority_, ACE_SCOPE_THREAD);
         }
     } /* end of for () */
+
+  return 0;
 }
 
 int
@@ -693,7 +695,7 @@ Client_i::do_priority_inversion_test (ACE_Thread_Manager *thread_manager)
       }
 
   // Create the clients.
-  u_int result = this->activate_high_client (thread_manager);
+  int result = this->activate_high_client (thread_manager);
 
   if (result < 0)
     return result;
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/Globals.cpp b/TAO/tests/Cubit/TAO/MT_Cubit/Globals.cpp
index 349006abbac..ba11f80afd2 100644
--- a/TAO/tests/Cubit/TAO/MT_Cubit/Globals.cpp
+++ b/TAO/tests/Cubit/TAO/MT_Cubit/Globals.cpp
@@ -126,7 +126,7 @@ MT_Priority::get_low_priority (u_int num_low_priority,
                                ACE_Sched_Priority prev_priority,
                                u_int use_multiple_priority)
 {
-  ACE_Sched_Priority low_priority;
+  ACE_Sched_Priority low_priority = ACE_THR_PRI_FIFO_DEF;
 
   // Drop the priority.
   if (use_multiple_priority)
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/client.cpp b/TAO/tests/Cubit/TAO/MT_Cubit/client.cpp
index cdbd244a288..2a87a589794 100644
--- a/TAO/tests/Cubit/TAO/MT_Cubit/client.cpp
+++ b/TAO/tests/Cubit/TAO/MT_Cubit/client.cpp
@@ -434,6 +434,8 @@ Client_i::activate_low_client (ACE_Thread_Manager *thread_manager)
               (ACE_SCHED_FIFO, this->low_priority_, ACE_SCOPE_THREAD);
         }
     } /* end of for () */
+
+  return 0;
 }
 
 int
@@ -693,7 +695,7 @@ Client_i::do_priority_inversion_test (ACE_Thread_Manager *thread_manager)
       }
 
   // Create the clients.
-  u_int result = this->activate_high_client (thread_manager);
+  int result = this->activate_high_client (thread_manager);
 
   if (result < 0)
     return result;
diff --git a/ace/ACE.h b/ace/ACE.h
index 2dc03b17bd0..4cd1a52e9c6 100644
--- a/ace/ACE.h
+++ b/ace/ACE.h
@@ -456,9 +456,11 @@ public:
   // This method is just like <strdup>, except that it uses <operator
   // new> rather than <malloc>.
 
+#   if defined (ACE_WIN32)
   static wchar_t *strnew (const wchar_t *s); 
   // This method is just like <strdup>, except that it uses <operator
   // new> rather than <malloc>.
+#endif /* ACE_WIN32 */
 
   static char *strndup (const char *str, size_t n);
   // Create a fresh new copy of <str>, up to <n> chars long.  Uses
diff --git a/ace/ACE.i b/ace/ACE.i
index d63c508c232..13005f0ade4 100644
--- a/ace/ACE.i
+++ b/ace/ACE.i
@@ -140,6 +140,7 @@ ACE::strnew (const char *s)
     return ACE_OS::strcpy (t, s);
 }
 
+#if defined (ACE_WIN32)
 ASYS_INLINE wchar_t *
 ACE::strnew (const wchar_t *s)
 {
@@ -150,3 +151,4 @@ ACE::strnew (const wchar_t *s)
   else
     return ACE_OS::strcpy (t, s);
 }
+#endif /* ACE_WIN32 */
diff --git a/ace/README b/ace/README
index d26059cbb74..1e52e4fcc58 100644
--- a/ace/README
+++ b/ace/README
@@ -79,7 +79,7 @@ ACE_HAS_CHARPTR_SPRINTF                 sprintf() returns char * rather than int
 ACE_HAS_CLOCK_GETTIME                   Platform supports POSIX 1.b clock_gettime ()
 ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES    Prototypes for both signal() and struct sigaction are consistent.
 ACE_HAS_CPLUSPLUS_HEADERS               Compiler/platform has correctly prototyped header files
-ACE_HAS_DIRENT                          Compiler/platform has Dirent iterator.
+ACE_HAS_DIRENT                          Compiler/platform has Dirent iterator functions
 ACE_HAS_DLFCN_H_BROKEN_EXTERN_C         For platforms, e.g., RedHat 4.2/Linux 2.0.30/Alpha, that don't declare dl* functions as extern "C" in dlfcn.h.
 ACE_HAS_DLL                             Build ACE using the frigging PC DLL nonsense...
 ACE_HAS_EXCEPTIONS                      Compiler supports C++ exception handling
diff --git a/ace/config-sco-4.2-nothread.h b/ace/config-sco-4.2-nothread.h
index 0a6d59d7d9a..26113affccf 100644
--- a/ace/config-sco-4.2-nothread.h
+++ b/ace/config-sco-4.2-nothread.h
@@ -110,5 +110,5 @@
 #if !defined (ACE_NTRACE)
 #define ACE_NTRACE 1
 #endif /* ACE_NTRACE */
-
+#define ACE_HAS_DIRENT
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-sco-5.0.0-mit-pthread.h b/ace/config-sco-5.0.0-mit-pthread.h
index c7ffa463352..80e462b3a0e 100644
--- a/ace/config-sco-5.0.0-mit-pthread.h
+++ b/ace/config-sco-5.0.0-mit-pthread.h
@@ -179,5 +179,6 @@
 #define ACE_HAS_READV_TIMEDWAIT
 #define ACE_HAS_WRITE_TIMEDWAIT
 #define ACE_HAS_WRITEV_TIMEDWAIT
+#define ACE_HAS_DIRENT
 
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-sco-5.0.0.h b/ace/config-sco-5.0.0.h
index 6366658f7f6..a74317cb6e1 100644
--- a/ace/config-sco-5.0.0.h
+++ b/ace/config-sco-5.0.0.h
@@ -104,5 +104,6 @@
 
 // #define      ACE_HAS_POSIX_TIME
 #define ACE_HAS_IP_MULTICAST
+#define ACE_HAS_DIRENT
 
 #endif /* ACE_CONFIG_SCO_5_0_0_H */
diff --git a/apps/JAWS/clients/Caching/URL_Properties.h b/apps/JAWS/clients/Caching/URL_Properties.h
index ad490e5d285..18ae4bc6b2f 100644
--- a/apps/JAWS/clients/Caching/URL_Properties.h
+++ b/apps/JAWS/clients/Caching/URL_Properties.h
@@ -19,7 +19,7 @@
 #define ACE_URL_PROPERTIES_H
 
 #include "ace/SString.h"
-#include "ace/Array.h"
+#include "ace/Containers.h"
 
 class ACE_SVC_Export ACE_WString_Helper
   // = TITLE