ChangeLogTag:Wed Aug 6 03:29:03 UTC 2003 Don Hinton <dhinton@dresystems.com>

11 files changed, 45 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 9251a236f1f..58814d35d9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+Wed Aug  6 03:29:03 UTC 2003  Don Hinton  <dhinton@dresystems.com>
+
+        Additional includes required by recent subsetting.
+
+        * Kokyu/Dispatcher_Task.h: Lock_Adapter_T.h.
+        * apps/JAWS2/HTTPU/http_headers.h: Null_Mutex.h.
+        * apps/JAWS2/HTTPU/http_status.h: Synch_Traits.h.
+        * apps/JAWS2/JAWS/Cache_Manager_T.cpp: streams.h.
+        * apps/JAWS2/JAWS/IO.h: Synch_Traits.h.
+        * apps/JAWS2/JAWS/IO_Handler.h: RW_Thread_Mutex.h
+        * apps/JAWS2/JAWS/JAWS.h: Trace.h.
+        * apps/JAWS2/JAWS/Parse_Headers.h: Synch_Traits.h.
+        * apps/soreduce/Library.h: streams.h.
+
+        * apps/JAWS2/JAWS/Server.cpp: 
+          Added #ifdef around ACE_Trace calls to turn on/off tracing.
+
 Wed Aug  6 02:27:32 UTC 2003  Don Hinton  <dhinton@dresystems.com>
 
         * include/makeinclude/platform_g++_common.GNU:
diff --git a/Kokyu/Dispatcher_Task.h b/Kokyu/Dispatcher_Task.h
index 5d8eb49ca31..4b5979066a5 100644
--- a/Kokyu/Dispatcher_Task.h
+++ b/Kokyu/Dispatcher_Task.h
@@ -14,6 +14,7 @@
 #define TAO_DISPATCHER_TASK_H
 #include "ace/pre.h"
 #include "ace/Task.h"
+#include "ace/Lock_Adapter_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/apps/JAWS2/HTTPU/http_headers.h b/apps/JAWS2/HTTPU/http_headers.h
index 41afd21d15d..2bfe04c8437 100644
--- a/apps/JAWS2/HTTPU/http_headers.h
+++ b/apps/JAWS2/HTTPU/http_headers.h
@@ -7,6 +7,7 @@
 #define HTTPU_HTTP_HEADERS_H
 
 #include "ace/RB_Tree.h"
+#include "ace/Null_Mutex.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/apps/JAWS2/HTTPU/http_status.h b/apps/JAWS2/HTTPU/http_status.h
index c4d90657b15..3a4567c0a1c 100644
--- a/apps/JAWS2/HTTPU/http_status.h
+++ b/apps/JAWS2/HTTPU/http_status.h
@@ -10,6 +10,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "HTTPU/http_export.h"
+#include "ace/Synch_Traits.h"
 
 class HTTP_SCode_Base;
 
diff --git a/apps/JAWS2/JAWS/Cache_Manager_T.cpp b/apps/JAWS2/JAWS/Cache_Manager_T.cpp
index 2d05437276c..ceb5227e5a0 100644
--- a/apps/JAWS2/JAWS/Cache_Manager_T.cpp
+++ b/apps/JAWS2/JAWS/Cache_Manager_T.cpp
@@ -6,6 +6,7 @@
 #include "JAWS/Cache_Manager_T.h"
 #include "JAWS/Cache_Hash_T.h"
 #include "JAWS/Cache_List_T.h"
+#include "ace/streams.h"
 
 class Cache_Manager;
 
@@ -230,7 +231,7 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
   if (result == -1)
     {
       if (size/1024 <= this->maxobjsize_)
-        cerr << "MAKE failed.  Bummer!" << endl;
+        std::cerr << "MAKE failed.  Bummer!" << std::endl;
       else
         this->DROP_i (obj);
       return -1;
@@ -244,7 +245,7 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
   result = this->hash_->rebind (key, obj, old_key, old_obj);
   if (result == -1)
     {
-      cerr << "*** hash bind error: " << key << endl;
+      std::cerr << "*** hash bind error: " << key << std::endl;
       obj->release ();
       this->DROP_i (obj);
       return -1;
@@ -260,7 +261,7 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
   result = this->heap_->insert (key, obj);
   if (result == -1)
     {
-      cerr << "*** heap insertion error: " << key << endl;
+      std::cerr << "*** heap insertion error: " << key << std::endl;
       this->hash_->unbind (key);
       obj->release ();
       this->DROP_i (obj);
@@ -282,19 +283,19 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
   JAWS_Cache_Object *temp_object;
 
 #ifdef ENTERA_VERBOSE_TRACE
-  cerr << "*** flush key unbinding: " << key << endl;
+  std::cerr << "*** flush key unbinding: " << key << std::endl;
 #endif
   int result = this->hash_->unbind (key, temp_object);
   if (result == 0)
     {
       this->waterlevel_ -= temp_object->size ();
       if (this->heap_->remove (temp_object->heap_item ()) == -1)
-        cerr << "*** flush key heap remove failed: " << endl;
+        std::cerr << "*** flush key heap remove failed: " << std::endl;
       temp_object->release ();
       this->DROP_i (temp_object);
     }
   else
-    cerr << "*** flush key hash unbind failed: " << key << endl;
+    std::cerr << "*** flush key hash unbind failed: " << key << std::endl;
 
   return result;
 }
@@ -310,11 +311,11 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
   if (result == 0)
     {
 #ifdef ENTERA_VERBOSE_TRACE
-      cerr << "*** flush unbinding: " << temp_key << endl;
+      std::cerr << "*** flush unbinding: " << temp_key << std::endl;
 #endif
       result = this->hash_->unbind (temp_key);
       if (result == -1)
-        cerr << "*** flush hash unbind failed: " << temp_key << endl;
+        std::cerr << "*** flush hash unbind failed: " << temp_key << std::endl;
       result = 0;
       this->waterlevel_ -= temp_object->size ();
       temp_object->release ();
@@ -391,7 +392,7 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
 
     {
       // Don't bother to cache this.
-      cerr << "*** " << size << " is too small to cache" << endl;
+      std::cerr << "*** " << size << " is too small to cache" << std::endl;
       return -1;
     }
 
@@ -402,7 +403,7 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
         {
           if (this->FLUSH_i () == -1)
             {
-              cerr << "*** cache flooded, flush error" << endl;
+              std::cerr << "*** cache flooded, flush error" << endl;
               return -1;
             }
         }
@@ -412,10 +413,10 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
   // make sure heap has enough room
   if (this->heap_->is_full ())
     {
-      cerr << "*** heap full, flushing" << endl;
+      std::cerr << "*** heap full, flushing" << std::endl;
       if (this->FLUSH_i () == -1)
         {
-          cerr << "*** heap full, flush error" << endl;
+          std::cerr << "*** heap full, flush error" << std::endl;
           return -1;
         }
     }
@@ -423,7 +424,7 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
   obj = this->factory_->create (data, size);
   if (this->TAKE (obj) == -1)
     {
-      cerr << "*** take error" << endl;
+      std::cerr << "*** take error" << std::endl;
       this->factory_->destroy (obj);
       obj = 0;
       return -1;
@@ -461,20 +462,20 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
             {
               KEY *key = (KEY *) obj->internal ();
 #ifdef ENTERA_VERBOSE_TRACE
-              cerr << "*** drop large unbinding: " << key << endl;
+              std::cerr << "*** drop large unbinding: " << key << std::endl;
 #endif
               result = this->hash_->unbind (*key);
               if (result == 0)
                 {
                   if (this->heap_->remove (obj->heap_item ()) == -1)
-                    cerr << "*** drop large heap remove failed: " << endl;
+                    std::cerr << "*** drop large heap remove failed: " << std::endl;
                   this->factory_->destroy (obj);
                   delete key;
                   obj = 0;
                   result = 1;
                 }
               else
-                cerr << "*** drop large hash unbind failed: " << key << endl;
+                std::cerr << "*** drop large hash unbind failed: " << key << std::endl;
             }
         }
       return result;
diff --git a/apps/JAWS2/JAWS/IO.h b/apps/JAWS2/JAWS/IO.h
index 8aadd9b4de9..58b5cdd1064 100644
--- a/apps/JAWS2/JAWS/IO.h
+++ b/apps/JAWS2/JAWS/IO.h
@@ -31,6 +31,7 @@ class JAWS_IO_Acceptor;
 #include "ace/Asynch_IO.h"
 #include "ace/SOCK_Stream.h"
 #include "ace/Singleton.h"
+#include "ace/Synch_Traits.h"
 
 #include "JAWS/Export.h"
 
diff --git a/apps/JAWS2/JAWS/IO_Handler.h b/apps/JAWS2/JAWS/IO_Handler.h
index 7d49dbe3f06..a300af012e0 100644
--- a/apps/JAWS2/JAWS/IO_Handler.h
+++ b/apps/JAWS2/JAWS/IO_Handler.h
@@ -25,6 +25,8 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Singleton.h"
+#include "ace/Synch_Traits.h"
+#include "ace/RW_Thread_Mutex.h"
 
 #include "JAWS/Export.h"
 
diff --git a/apps/JAWS2/JAWS/JAWS.h b/apps/JAWS2/JAWS/JAWS.h
index 930d5fcbf60..06087a89a2b 100644
--- a/apps/JAWS2/JAWS/JAWS.h
+++ b/apps/JAWS2/JAWS/JAWS.h
@@ -6,6 +6,7 @@
 # define JAWS_TRACE(X) ACE_Trace ____ (ACE_TEXT (X), \
                                        __LINE__, \
                                        ACE_TEXT (__FILE__))
+#include "ace/Trace.h"
 #endif /* JAWS_NTRACE */
 
 #ifndef JAWS_JAWS_H
diff --git a/apps/JAWS2/JAWS/Parse_Headers.h b/apps/JAWS2/JAWS/Parse_Headers.h
index 24bdc0d2462..5294117aa2f 100644
--- a/apps/JAWS2/JAWS/Parse_Headers.h
+++ b/apps/JAWS2/JAWS/Parse_Headers.h
@@ -12,6 +12,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Message_Block.h"
+#include "ace/Synch_Traits.h"
 
 #include "Headers.h"
 
diff --git a/apps/JAWS2/JAWS/Server.cpp b/apps/JAWS2/JAWS/Server.cpp
index 9c729bc6c81..69fc91e3b13 100644
--- a/apps/JAWS2/JAWS/Server.cpp
+++ b/apps/JAWS2/JAWS/Server.cpp
@@ -179,10 +179,12 @@ JAWS_Server::parse_args (int argc, char *argv[])
         break;
       }
 
+#if (ACE_NTRACE != 1)
   if (t)
     ACE_Trace::start_tracing ();
   else
     ACE_Trace::stop_tracing ();
+#endif /* ACE_NTRACE != 1*/
 
   if (this->port_ == 0) this->port_ = 5432;
   if (this->nthreads_ == 0) this->nthreads_ = 5;
diff --git a/apps/soreduce/Library.h b/apps/soreduce/Library.h
index 46cb03feac7..f333a64351b 100644
--- a/apps/soreduce/Library.h
+++ b/apps/soreduce/Library.h
@@ -16,6 +16,7 @@
 // for outputting a specialized makefile build the reduce footprint library.
 
 #include "Obj_Module.h"
+#include "ace/streams.h"
 
 // The Makefile generator class serves as the base class used to output the
 // custom makefiles (or in the future, project files) used to build the