ChangeLogTag:Tue May 7 09:21:50 UTC 2002 Don Hinton <dhinton@ieee.org>

6 files changed, 49 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index ffa29da4abc..6ce3491c2fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,22 @@
+Tue May  7 09:21:50 UTC 2002  Don Hinton  <dhinton@ieee.org>
+
+	* ace/ace_stdio.h:
+
+	  Commented out ifdef that include cstdio.  This was mistakenly
+	  copied from config-all.h.  If this cleans up the sun builds, it will
+	  be removed completely.
+
+	* ace/Array_Base.inl:
+
+	  Added include of Trace.h.
+	
 Mon May  6 19:11:05 UTC 2002  Don Hinton  <dhinton@ieee.org>
 
 	* ace/Sched_Params.cpp:
 
 	  Added include of OS.h when ACE_HAS_PRIOCNTL && ACE_HAS_STHREADS
 	  are defined.
-
+	
 Mon May  6 15:53:39 UTC 2002  Don Hinton  <dhinton@ieee.org>
 
 	* ace/Array_Base.cpp:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index ffa29da4abc..6ce3491c2fc 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,10 +1,22 @@
+Tue May  7 09:21:50 UTC 2002  Don Hinton  <dhinton@ieee.org>
+
+	* ace/ace_stdio.h:
+
+	  Commented out ifdef that include cstdio.  This was mistakenly
+	  copied from config-all.h.  If this cleans up the sun builds, it will
+	  be removed completely.
+
+	* ace/Array_Base.inl:
+
+	  Added include of Trace.h.
+	
 Mon May  6 19:11:05 UTC 2002  Don Hinton  <dhinton@ieee.org>
 
 	* ace/Sched_Params.cpp:
 
 	  Added include of OS.h when ACE_HAS_PRIOCNTL && ACE_HAS_STHREADS
 	  are defined.
-
+	
 Mon May  6 15:53:39 UTC 2002  Don Hinton  <dhinton@ieee.org>
 
 	* ace/Array_Base.cpp:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index ffa29da4abc..6ce3491c2fc 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,10 +1,22 @@
+Tue May  7 09:21:50 UTC 2002  Don Hinton  <dhinton@ieee.org>
+
+	* ace/ace_stdio.h:
+
+	  Commented out ifdef that include cstdio.  This was mistakenly
+	  copied from config-all.h.  If this cleans up the sun builds, it will
+	  be removed completely.
+
+	* ace/Array_Base.inl:
+
+	  Added include of Trace.h.
+	
 Mon May  6 19:11:05 UTC 2002  Don Hinton  <dhinton@ieee.org>
 
 	* ace/Sched_Params.cpp:
 
 	  Added include of OS.h when ACE_HAS_PRIOCNTL && ACE_HAS_STHREADS
 	  are defined.
-
+	
 Mon May  6 15:53:39 UTC 2002  Don Hinton  <dhinton@ieee.org>
 
 	* ace/Array_Base.cpp:
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 18e42aa506d..4f513b43d72 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -4,7 +4,7 @@ Mon May  6 15:53:39 UTC 2002  Don Hinton  <dhinton@ieee.org>
 
 	  Added include of ace/Global_Macros.h.
 
-	* tao/Thread_Lan_Resources.h:
+	* tao/Thread_Lane_Resources.h:
 
 	  Added include of ace/Synch_T.h.
 
diff --git a/ace/Array_Base.inl b/ace/Array_Base.inl
index 9b7c17f8d92..eb8ce97dd61 100644
--- a/ace/Array_Base.inl
+++ b/ace/Array_Base.inl
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
 // $Id$
 
-//#include "ace/Global_Macros.h"
+#include "ace/Trace.h"
 
 // Clean up the array (e.g., delete dynamically allocated memory).
 
diff --git a/ace/ace_stdio.h b/ace/ace_stdio.h
index 6b75b5cc67b..74bc80314d3 100644
--- a/ace/ace_stdio.h
+++ b/ace/ace_stdio.h
@@ -25,6 +25,9 @@
 #   include /**/ <stdarg.h> // LynxOS requires this before stdio.h 
 # endif /* !ACE_LACKS_STDARG_H */
 
+#if 0
+// turn this off for now.  it came from config-all.h when ACE_HAS_VERBOSE_NOTSUP
+// turned on.
 # if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)
 #   include /**/ <cstdio>
 # else
@@ -32,6 +35,11 @@
 #     include /**/ <stdio.h>
 #   endif /* !ACE_LACKS_STDIO_H */
 # endif
+#else /* 0 */
+# if !defined (ACE_LACKS_STDIO_H)
+#   include /**/ <stdio.h>
+# endif /* !ACE_LACKS_STDIO_H */
+#endif /* 0 */
 
 # if defined (ACE_HAS_CHARPTR_SPRINTF)
 #   define ACE_SPRINTF_ADAPTER(X) ::strlen (X)