Please let this work.

10 files changed, 8554 insertions, 125 deletions

diff --git a/ace/Event_Handler.h b/ace/Event_Handler.h
index 27b76b0dca0..7e76a9e60a2 100644
--- a/ace/Event_Handler.h
+++ b/ace/Event_Handler.h
@@ -83,7 +83,7 @@ public:
   virtual int handle_exception (ACE_HANDLE fd = ACE_INVALID_HANDLE);
   // Called when execption events occur (e.g., SIGURG).
 
-  virtual int handle_timeout (const ACE_Time_Value &tv, 
+  virtual int handle_timeout (const ACE_Time_Value &tv,
 			      const void *arg = 0);
   // Called when timer expires.
 
diff --git a/ace/ReactorEx.cpp b/ace/ReactorEx.cpp
index caa499ff8dc..c440e2ba2b3 100644
--- a/ace/ReactorEx.cpp
+++ b/ace/ReactorEx.cpp
@@ -12,7 +12,6 @@
 
 ACE_ReactorEx::ACE_ReactorEx (ACE_Timer_Queue *tq)
   : active_handles_ (0),
-    timer_skew_ (0, ACE_TIMER_SKEW),
     token_ (*this)
 {
   this->timer_queue_ = tq;
@@ -52,7 +51,7 @@ ACE_ReactorEx::register_handler (ACE_Event_Handler *eh,
   if (handle == ACE_INVALID_HANDLE)
     handle = eh->get_handle ();
   this->handles_[this->active_handles_] = handle;
-  this->handlers_[this->active_handles_] = eh;
+  this->event_handlers_[this->active_handles_] = eh;
   this->active_handles_++;
 
   // Assign *this* <ReactorEx> to the <Event_Handler>.
@@ -79,7 +78,7 @@ ACE_ReactorEx::remove_handler (ACE_Event_Handler *eh,
       if (this->handles_[index] == handle)
 	{
 	  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::DONT_CALL) == 0)
-	    handlers_[index]->handle_close (handle,
+	    event_handlers_[index]->handle_close (handle,
 					    ACE_Event_Handler::NULL_MASK);
 
 	  // If there was only one handle, reset the pointer to 0.
@@ -98,7 +97,7 @@ ACE_ReactorEx::remove_handler (ACE_Event_Handler *eh,
 	  else
 	    {
 	      this->handles_[index] = this->handles_[--this->active_handles_];
-	      this->handlers_[index] = this->handlers_[this->active_handles_];
+	      this->event_handlers_[index] = this->event_handlers_[this->active_handles_];
 	    }
 	}
     }
@@ -114,131 +113,132 @@ ACE_ReactorEx::schedule_timer (ACE_Event_Handler *handler,
 {
   ACE_TRACE ("ACE_ReactorEx::schedule_timer");
 
+  ACE_GUARD_RETURN (ACE_ReactorEx_Token, ace_mon, this->token_, -1);
+
   return this->timer_queue_->schedule 
     (handler, arg, ACE_OS::gettimeofday () + delta_time, interval);
 }
 
+// Waits for and dispatches all events.  Returns -1 on error, 0 if
+// how_long expired, and 1 if events were dispatched.
 int 
 ACE_ReactorEx::handle_events (ACE_Time_Value *how_long,
 			      int wait_all)
 {
   ACE_TRACE ("ACE_ReactorEx::handle_events");
 
-  // @@ Need to implement -wait_all-.
+  // Stash the current time -- the destructor of this object will
+  // automatically compute how much time elapsed since this method was
+  // called.
+  ACE_Countdown_Time countdown (how_long);
 
-  // Tim, is this the right place for the token lock?
+#if defined (ACE_MT_SAFE)
   ACE_GUARD_RETURN (ACE_ReactorEx_Token, ace_mon, this->token_, -1);
 
-  // Tim, this function is too long.  It should be broken up into
-  // another several methods (e.g., wait_for_multi_events() and
-  // dispatch(), just like the ACE_Reactor.
-  
-  DWORD wait_status;
-  int handles_skipped = 0;
-
-  // These relative_things are moved through the handles_ each time
-  // handle_events is called.  Set relative index = -1 so we can check
-  // in case of timeouts.
-  int relative_index = -1;
-  ACE_HANDLE *relative_handles = this->handles_;
-  ACE_Event_Handler **relative_handlers = this->handlers_;
-
-  // Stash the current time.
-  ACE_Time_Value prev_time = ACE_OS::gettimeofday ();
+  // Update the countdown to reflect time waiting for the mutex.
+  countdown.update ();
+#endif /* ACE_MT_SAFE */
+
+  if (active_handles_ < 1)
+    {
+      // @@ What should this be?
+      errno = ENOENT;
+      return -1;
+    }
+
   // Check for pending timeout events.
-  how_long = timer_queue_->calculate_timeout (how_long);
+  ACE_Time_Value *wait_time = timer_queue_->calculate_timeout (how_long);
   // Translate into Win32 time value.
-  int timeout = how_long == 0 ? INFINITE : how_long->msec ();
-
-  int active_handles = this->active_handles_;
+  int timeout = wait_time == 0 ? INFINITE : wait_time->msec ();
+
+  // Wait for any of handles_ to be active, or until timeout expires.
+  // If wait_all is true, then wait for all handles_ to be active.
+  DWORD wait_status = ::WaitForMultipleObjects (active_handles_,
+						handles_,
+						wait_all,
+						timeout);
+  // Expire all pending timers.
+  this->timer_queue_->expire ();
+
+  switch (wait_status)
+    {
+    case WAIT_FAILED: // Failure.
+      errno = ::GetLastError ();
+      return -1;
+    case WAIT_TIMEOUT: // Timeout.
+      errno = ETIME;
+      return 0;
+    case WAIT_ABANDONED_0:
+      // We'll let dispatch_all worry about abandoned mutexes.
+    default:  // Dispatch.
+      return this->dispatch_all (wait_status - WAIT_OBJECT_0, wait_all);
+    }
+}
 
-  while (active_handles > 0)
+// Dispatches any active handles from handles_[-index-] to
+// handles_[active_handles_] using WaitForMultipleObjects to poll
+// through our handle set looking for active handles.
+int
+ACE_ReactorEx::dispatch_all (int index, int wait_all)
+{
+  while (1)
     {
-      wait_status = ::WaitForMultipleObjects (active_handles,
-					      relative_handles,
-					      wait_all,
-					      timeout);
-      if (!this->timer_queue_->is_empty ())
-	// Fudge factor accounts for problems with Solaris timers...
-	this->timer_queue_->expire (ACE_OS::gettimeofday () + this->timer_skew_);
-
-      // Compute the time while the ReactorEx was processing.
-      ACE_Time_Value elapsed_time = ACE_OS::gettimeofday () - prev_time;
-
-      // Update -how_long- to reflect the amount of time since
-      // handle_events was called.  This is computed in case we return
-      // from the switch.
-      if (how_long != 0)
-	{
-	  if (*how_long > elapsed_time)
-	    *how_long = *how_long - elapsed_time;
-	  else
-	    *how_long = ACE_Time_Value::zero; // Used all of timeout.
-	}
+      if (this->dispatch_handler (index) == 0)
+	index++;
 
-      switch (wait_status)
+      // Check if we're all out of handles.
+      if (index == active_handles_)
+	return 0;
+
+      // If wait_all is TRUE, then we know that every handle is active
+      // and there's no need to call WaitForMultipleObjects; We just
+      // iterate through and dispatch each handler.
+      if (wait_all == 0)
 	{
-	case WAIT_TIMEOUT:
-	  errno = ETIME;
-	  // If we timed out on the first call, return 0, otherwise
-	  // an event must have occured; return 1.
-	  return relative_index == -1 ? 0 : 1;
-	case WAIT_FAILED:
-	  errno = ::GetLastError ();
-	  return -1;
-	default:
-	  {
-	    // @@ Need to implement WAIT_ABANDONED_0 stuff.
-	    relative_index = wait_status - WAIT_OBJECT_0;
-	    // Assign the ``signaled'' HANDLE so that callers can get
-	    // it.
-	    siginfo_t sig (relative_handles[relative_index]);
-	    
-	    if (relative_handlers[relative_index]->handle_signal 
-		(0, &sig) == -1)
-	      // If we remove a handler, then the index should stay
-	      // the same since it may have been replaced with the end
-	      // handle by remove_handler.
-	      this->remove_handler (relative_handlers[relative_index]);
-	    else
-	      // If we did not remove the handler, then move the index
-	      // up one so that we skip this handler on the next
-	      // iteration.
-	      relative_index++;
-
-	    // Update the relative pointers.
-	    relative_handles = &relative_handles[relative_index];
-	    relative_handlers = &relative_handlers[relative_index];
-
-	    // The number of remaining active handles is
-	    // active_handles_ less the number of handles we skipped
-	    // over.
-	    handles_skipped += relative_index;
-	    active_handles = this->active_handles_ - handles_skipped;
-
-	    // Make the timeout be zero so that we don't block on any
-	    // subsequent calls to WaitForMultipleObjects.  Rather, we
-	    // just poll through the rest looking for signaled handles.
-	    timeout = 0; 
-	  }
+	  DWORD wait_status = 
+	    ::WaitForMultipleObjects (active_handles_ - index,
+				      &(handles_[index]),
+				      FALSE, 0); // We're polling.
+
+	  switch (wait_status)
+	    {
+	    case WAIT_FAILED: // Failure.
+	      errno = ::GetLastError ();
+	      return -1;
+	    case WAIT_TIMEOUT:
+	      // There are no more handles ready, we can return.
+	      return 0;
+	    default:  // Dispatch.
+	      // Check if a handle successfully became signaled.
+	      if ((wait_status >= WAIT_OBJECT_0) &&
+		  (wait_status < WAIT_OBJECT_0 + active_handles_))
+		index += (wait_status - WAIT_OBJECT_0);
+	      else
+		// Otherwise, a handle was abandoned.
+		index += (wait_status - WAIT_ABANDONED_0);
+	    }
 	}
     }
+}
+
 
-  // Compute the time while the ReactorEx was processing.  Note that
-  // this is recomputed to reflect time spent dispatching handlers.
-  ACE_Time_Value elapsed_time = ACE_OS::gettimeofday () - prev_time;
+// Dispatches a single handler.  Returns 0 on success, -1 if the
+// handler was removed.
+int
+ACE_ReactorEx::dispatch_handler (int index)
+{
+  // Assign the ``signaled'' HANDLE so that callers can get
+  // it.
+  siginfo_t sig (handles_[index]);
 
-  // Update how_long to reflect the amount of time since handle_events
-  // was called.
-  if (how_long != 0)
+  // Dispatch the handler.
+  if (event_handlers_[index]->handle_signal (0, &sig) == -1)
     {
-      if (*how_long > elapsed_time)
-	*how_long = *how_long - elapsed_time;
-      else
-	*how_long = ACE_Time_Value::zero; // Used all of timeout.
+      this->remove_handler (event_handlers_[index]);
+      return -1;
     }
-
-  return 0;
+  else
+    return 0;
 }
 
 // ************************************************************
diff --git a/ace/ReactorEx.h b/ace/ReactorEx.h
index cc05e9bd418..86ca5e193b1 100644
--- a/ace/ReactorEx.h
+++ b/ace/ReactorEx.h
@@ -18,6 +18,7 @@
 #define ACE_ReactorEx_H
 
 #include "ace/Time_Value.h"
+#include "ace/Timer_Queue.h"
 #include "ace/Event_Handler.h"
 #include "ace/Message_Queue.h"
 #include "ace/Token.h"
@@ -123,7 +124,7 @@ public:
 
   // = Initialization and termination methods.
 
-  ACE_ReactorEx (ACE_Timer_Queue * = 0);
+  ACE_ReactorEx (ACE_Timer_Queue *tq = 0);
   // Initialize the new ACE_ReactorEx with the default size.
 
   virtual ~ACE_ReactorEx (void);
@@ -134,7 +135,15 @@ public:
   // returning (will return earlier if I/O or signal events occur).
   // Note that -how_long- can be 0, in which case this method blocks
   // until I/O events or signals occur.  Returns 0 if timed out, 1 if
-  // an event occurred, and -1 if an error occured.
+  // an event occurred, and -1 if an error occured.  -how_long- is
+  // decremented to reflect how much time the call to handle_events
+  // took.  For instance, if a time value of 3 seconds is passed to
+  // handle_events and an event occurs after 2 seconds, -how_long-
+  // will equal 1 second.  This can be used if an application wishes
+  // to handle events for some fixed amount of time.  If wait_all is
+  // TRUE, then handle_events will only dispatch the handlers if *all*
+  // handles become active.  If a timeout occurs, then no handlers
+  // will be dispatched.
   virtual int handle_events (ACE_Time_Value *how_long = 0,
 			     int wait_all = 0);
   virtual int handle_events (ACE_Time_Value &how_long,
@@ -195,6 +204,15 @@ public:
   // Declare the dynamic allocation hooks.
 
 protected:
+  int dispatch_all (int index, int wait_all);
+  // Dispatches any active handles from handles_[-index-] to
+  // handles_[active_handles_] using WaitForMultipleObjects to poll
+  // through our handle set looking for active handles.
+
+  int dispatch_handler (int index);
+  // Dispatches a single handler.  Returns 0 on success, -1 if the
+  // handler was removed.
+
   ACE_Timer_Queue *timer_queue_;
   // Defined as a pointer to allow overriding by derived classes...
 
@@ -202,13 +220,10 @@ protected:
   // Keeps track of whether we should delete the timer queue (if we
   // didn't create it, then we don't delete it).
 
-  ACE_Time_Value timer_skew_;
-  // Adjusts for timer skew in various clocks.
-
   ACE_HANDLE handles_[MAX_SIZE];
   // Array of handles passed to WaitForMultipleObjects.
 
-  ACE_Event_Handler *handlers_[MAX_SIZE];
+  ACE_Event_Handler *event_handlers_[MAX_SIZE];
   // Array of Event_Handler pointers that store the handlers to
   // dispatch when the corresponding handles_ entry becomes signaled.
 
diff --git a/ace/ReactorEx.i b/ace/ReactorEx.i
index 9b63aa713df..fda66981674 100644
--- a/ace/ReactorEx.i
+++ b/ace/ReactorEx.i
@@ -12,7 +12,7 @@ ACE_ReactorEx::cancel_timer (ACE_Event_Handler *handler)
 
 ACE_INLINE int
 ACE_ReactorEx::cancel_timer (int timer_id, 
-			    const void **arg)
+			     const void **arg)
 {
   ACE_TRACE ("ACE_ReactorEx::cancel_timer");
   return this->timer_queue_->cancel (timer_id, arg);
@@ -20,7 +20,7 @@ ACE_ReactorEx::cancel_timer (int timer_id,
 
 ACE_INLINE int
 ACE_ReactorEx::handle_events (ACE_Time_Value &how_long,
-			       int wait_all)
+			      int wait_all)
 {
   return this->handle_events (&how_long, wait_all);
 }
diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp
index 6d87235f2c4..bd9c4b674dc 100644
--- a/ace/Service_Config.cpp
+++ b/ace/Service_Config.cpp
@@ -793,7 +793,8 @@ ACE_Service_Config::run_proactor_event_loop (ACE_Time_Value &tv)
 {
   ACE_TRACE ("ACE_Service_Config::run_proactor_event_loop");
 
-  while (ACE_Service_Config::end_proactor_event_loop_ == 0)
+  while ((ACE_Service_Config::end_proactor_event_loop_ == 0) &&
+	 (tv != ACE_Time_Value::zero))
     {
       int result = ACE_Service_Config::proactor ()->handle_events (tv);
       if (ACE_Service_Config::reconfig_occurred_)
@@ -844,12 +845,14 @@ ACE_Service_Config::run_reactorEx_event_loop (void)
   return 0;
 }
 
+
 int
 ACE_Service_Config::run_reactorEx_event_loop (ACE_Time_Value &tv)
 {
   ACE_TRACE ("ACE_Service_Config::run_reactorEx_event_loop");
 
-  while (ACE_Service_Config::end_reactorEx_event_loop_ == 0)
+  while ((ACE_Service_Config::end_reactorEx_event_loop_ == 0) &&
+	 (tv != ACE_Time_Value::zero))
     {
       int result = ACE_Service_Config::reactorEx ()->handle_events (tv);
       if (ACE_Service_Config::reconfig_occurred_)
diff --git a/ace/Time_Value.cpp b/ace/Time_Value.cpp
index d265e4513fe..31127224cc0 100644
--- a/ace/Time_Value.cpp
+++ b/ace/Time_Value.cpp
@@ -239,6 +239,12 @@ ACE_Countdown_Time::start (void)
 }
 
 int
+ACE_Countdown_Time::update (void)
+{
+  return (this->stop () == 0) && this->start ();
+}
+
+int
 ACE_Countdown_Time::stop (void)
 {
   if (this->max_wait_time_ != 0 && this->stopped_ == 0)
diff --git a/ace/Time_Value.h b/ace/Time_Value.h
index 823d87d94c5..eba9f0048c0 100644
--- a/ace/Time_Value.h
+++ b/ace/Time_Value.h
@@ -265,10 +265,15 @@ public:
   // Call <stop>.
 
   int start (void);
-  // Cache the start value.
+  // Cache the current time and enter a start state.
 
   int stop (void);
-  // Compute the elapsed time.
+  // Subtract the elapsed time from max_wait_time_ and enter a stopped
+  // state.
+
+  int update (void);
+  // Calls stop and then start.  max_wait_time_ is modified by the
+  // call to stop.
 
 private:
   ACE_Time_Value *max_wait_time_;
diff --git a/ace/ace.mak b/ace/ace.mak
index 3c33102a3e5..58882943e73 100644
--- a/ace/ace.mak
+++ b/ace/ace.mak
@@ -1,4 +1,4 @@
-# Microsoft Developer Studio Generated NMAKE File, Format Version 4.00

+# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

@@ -53,6 +53,130 @@ INTDIR=.\Release
 ALL : "$(OUTDIR)\ace.dll"

 

 CLEAN : 

+<<<<<<< ace.mak
+	-@erase "$(INTDIR)\ACE.obj"

+	-@erase "$(INTDIR)\Activation_Queue.obj"

+	-@erase "$(INTDIR)\Addr.obj"

+	-@erase "$(INTDIR)\ARGV.obj"

+	-@erase "$(INTDIR)\CORBA_Handler.obj"

+	-@erase "$(INTDIR)\Date_Time.obj"

+	-@erase "$(INTDIR)\DEV.obj"

+	-@erase "$(INTDIR)\DEV_Addr.obj"

+	-@erase "$(INTDIR)\DEV_Connector.obj"

+	-@erase "$(INTDIR)\DEV_IO.obj"

+	-@erase "$(INTDIR)\Dump.obj"

+	-@erase "$(INTDIR)\Dynamic.obj"

+	-@erase "$(INTDIR)\Event_Handler.obj"

+	-@erase "$(INTDIR)\FIFO.obj"

+	-@erase "$(INTDIR)\FIFO_Recv.obj"

+	-@erase "$(INTDIR)\FIFO_Recv_Msg.obj"

+	-@erase "$(INTDIR)\FIFO_Send.obj"

+	-@erase "$(INTDIR)\FIFO_Send_Msg.obj"

+	-@erase "$(INTDIR)\FILE.obj"

+	-@erase "$(INTDIR)\FILE_Addr.obj"

+	-@erase "$(INTDIR)\FILE_Connector.obj"

+	-@erase "$(INTDIR)\FILE_IO.obj"

+	-@erase "$(INTDIR)\Get_Opt.obj"

+	-@erase "$(INTDIR)\Handle_Set.obj"

+	-@erase "$(INTDIR)\High_Res_Timer.obj"

+	-@erase "$(INTDIR)\INET_Addr.obj"

+	-@erase "$(INTDIR)\IO_Cntl_Msg.obj"

+	-@erase "$(INTDIR)\IO_SAP.obj"

+	-@erase "$(INTDIR)\IPC_SAP.obj"

+	-@erase "$(INTDIR)\Local_Name_Space.obj"

+	-@erase "$(INTDIR)\Local_Tokens.obj"

+	-@erase "$(INTDIR)\Log_Msg.obj"

+	-@erase "$(INTDIR)\Log_Record.obj"

+	-@erase "$(INTDIR)\LSOCK.obj"

+	-@erase "$(INTDIR)\LSOCK_Acceptor.obj"

+	-@erase "$(INTDIR)\LSOCK_CODgram.obj"

+	-@erase "$(INTDIR)\LSOCK_Connector.obj"

+	-@erase "$(INTDIR)\LSOCK_Dgram.obj"

+	-@erase "$(INTDIR)\LSOCK_Stream.obj"

+	-@erase "$(INTDIR)\Malloc.obj"

+	-@erase "$(INTDIR)\Mem_Map.obj"

+	-@erase "$(INTDIR)\Memory_Pool.obj"

+	-@erase "$(INTDIR)\Message_Block.obj"

+	-@erase "$(INTDIR)\Method_Object.obj"

+	-@erase "$(INTDIR)\Multiplexor.obj"

+	-@erase "$(INTDIR)\Name_Proxy.obj"

+	-@erase "$(INTDIR)\Name_Request_Reply.obj"

+	-@erase "$(INTDIR)\Name_Space.obj"

+	-@erase "$(INTDIR)\Naming_Context.obj"

+	-@erase "$(INTDIR)\Obstack.obj"

+	-@erase "$(INTDIR)\OS.obj"

+	-@erase "$(INTDIR)\Parse_Node.obj"

+	-@erase "$(INTDIR)\Pipe.obj"

+	-@erase "$(INTDIR)\Proactor.obj"

+	-@erase "$(INTDIR)\Process.obj"

+	-@erase "$(INTDIR)\Process_Manager.obj"

+	-@erase "$(INTDIR)\Profile_Timer.obj"

+	-@erase "$(INTDIR)\Reactor.obj"

+	-@erase "$(INTDIR)\ReactorEx.obj"

+	-@erase "$(INTDIR)\Read_Buffer.obj"

+	-@erase "$(INTDIR)\Registry.obj"

+	-@erase "$(INTDIR)\Remote_Name_Space.obj"

+	-@erase "$(INTDIR)\Remote_Tokens.obj"

+	-@erase "$(INTDIR)\Service_Config.obj"

+	-@erase "$(INTDIR)\Service_Main.obj"

+	-@erase "$(INTDIR)\Service_Manager.obj"

+	-@erase "$(INTDIR)\Service_Object.obj"

+	-@erase "$(INTDIR)\Service_Record.obj"

+	-@erase "$(INTDIR)\Service_Repository.obj"

+	-@erase "$(INTDIR)\Shared_Memory_MM.obj"

+	-@erase "$(INTDIR)\Shared_Memory_SV.obj"

+	-@erase "$(INTDIR)\Shared_Object.obj"

+	-@erase "$(INTDIR)\Signal.obj"

+	-@erase "$(INTDIR)\SOCK.obj"

+	-@erase "$(INTDIR)\SOCK_Acceptor.obj"

+	-@erase "$(INTDIR)\SOCK_CODgram.obj"

+	-@erase "$(INTDIR)\SOCK_Connector.obj"

+	-@erase "$(INTDIR)\SOCK_Dgram.obj"

+	-@erase "$(INTDIR)\SOCK_Dgram_Bcast.obj"

+	-@erase "$(INTDIR)\SOCK_Dgram_Mcast.obj"

+	-@erase "$(INTDIR)\SOCK_IO.obj"

+	-@erase "$(INTDIR)\SOCK_Stream.obj"

+	-@erase "$(INTDIR)\SPIPE.obj"

+	-@erase "$(INTDIR)\SPIPE_Acceptor.obj"

+	-@erase "$(INTDIR)\SPIPE_Addr.obj"

+	-@erase "$(INTDIR)\SPIPE_Connector.obj"

+	-@erase "$(INTDIR)\SPIPE_Stream.obj"

+	-@erase "$(INTDIR)\SString.obj"

+	-@erase "$(INTDIR)\SV_Message.obj"

+	-@erase "$(INTDIR)\SV_Message_Queue.obj"

+	-@erase "$(INTDIR)\SV_Semaphore_Complex.obj"

+	-@erase "$(INTDIR)\SV_Semaphore_Simple.obj"

+	-@erase "$(INTDIR)\SV_Shared_Memory.obj"

+	-@erase "$(INTDIR)\Svc_Conf_l.obj"

+	-@erase "$(INTDIR)\Svc_Conf_y.obj"

+	-@erase "$(INTDIR)\Synch.obj"

+	-@erase "$(INTDIR)\Synch_Options.obj"

+	-@erase "$(INTDIR)\System_Time.obj"

+	-@erase "$(INTDIR)\Task.obj"

+	-@erase "$(INTDIR)\Thread.obj"

+	-@erase "$(INTDIR)\Thread_Manager.obj"

+	-@erase "$(INTDIR)\Time_Request_Reply.obj"

+	-@erase "$(INTDIR)\Time_Value.obj"

+	-@erase "$(INTDIR)\Timer_Queue.obj"

+	-@erase "$(INTDIR)\TLI.obj"

+	-@erase "$(INTDIR)\TLI_Acceptor.obj"

+	-@erase "$(INTDIR)\TLI_Connector.obj"

+	-@erase "$(INTDIR)\TLI_Stream.obj"

+	-@erase "$(INTDIR)\Token.obj"

+	-@erase "$(INTDIR)\Token_Collection.obj"

+	-@erase "$(INTDIR)\Token_Invariants.obj"

+	-@erase "$(INTDIR)\Token_Manager.obj"

+	-@erase "$(INTDIR)\Token_Request_Reply.obj"

+	-@erase "$(INTDIR)\Trace.obj"

+	-@erase "$(INTDIR)\TTY_IO.obj"

+	-@erase "$(INTDIR)\UNIX_Addr.obj"

+	-@erase "$(INTDIR)\UPIPE_Acceptor.obj"

+	-@erase "$(INTDIR)\UPIPE_Connector.obj"

+	-@erase "$(INTDIR)\UPIPE_Stream.obj"

+	-@erase "$(OUTDIR)\ace.dll"

+	-@erase "$(OUTDIR)\ace.exp"

+	-@erase "$(OUTDIR)\ace.lib"

+=======
 	-@erase ".\ace.dll"

 	-@erase ".\Release\TLI_Acceptor.obj"

 	-@erase ".\Release\DEV_Addr.obj"

@@ -176,6 +300,7 @@ CLEAN :
 	-@erase ".\Release\Strategies.obj"

 	-@erase ".\ace.lib"

 	-@erase ".\ace.exp"

+>>>>>>> 4.8
 

 "$(INTDIR)" :

     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

@@ -185,7 +310,7 @@ CLEAN :
 CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\STL" /D "WIN32" /D "NDEBUG" /D\

  "_WINDOWS" /Fp"$(INTDIR)/ace.pch" /YX /Fo"$(INTDIR)/" /c 

 CPP_OBJS=.\Release/

-CPP_SBRS=

+CPP_SBRS=.\.

 # ADD BASE MTL /nologo /D "NDEBUG" /win32

 # ADD MTL /nologo /D "NDEBUG" /win32

 MTL_PROJ=/nologo /D "NDEBUG" /win32 

@@ -195,7 +320,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 BSC32_FLAGS=/nologo /o"$(OUTDIR)/ace.bsc" 

-BSC32_SBRS=

+BSC32_SBRS= \

+	

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386

 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386

@@ -205,6 +331,127 @@ LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
  /pdb:"$(OUTDIR)/ace.pdb" /machine:I386 /out:"$(OUTDIR)/ace.dll"\

  /implib:"$(OUTDIR)/ace.lib" 

 LINK32_OBJS= \

+<<<<<<< ace.mak
+	"$(INTDIR)\ACE.obj" \

+	"$(INTDIR)\Activation_Queue.obj" \

+	"$(INTDIR)\Addr.obj" \

+	"$(INTDIR)\ARGV.obj" \

+	"$(INTDIR)\CORBA_Handler.obj" \

+	"$(INTDIR)\Date_Time.obj" \

+	"$(INTDIR)\DEV.obj" \

+	"$(INTDIR)\DEV_Addr.obj" \

+	"$(INTDIR)\DEV_Connector.obj" \

+	"$(INTDIR)\DEV_IO.obj" \

+	"$(INTDIR)\Dump.obj" \

+	"$(INTDIR)\Dynamic.obj" \

+	"$(INTDIR)\Event_Handler.obj" \

+	"$(INTDIR)\FIFO.obj" \

+	"$(INTDIR)\FIFO_Recv.obj" \

+	"$(INTDIR)\FIFO_Recv_Msg.obj" \

+	"$(INTDIR)\FIFO_Send.obj" \

+	"$(INTDIR)\FIFO_Send_Msg.obj" \

+	"$(INTDIR)\FILE.obj" \

+	"$(INTDIR)\FILE_Addr.obj" \

+	"$(INTDIR)\FILE_Connector.obj" \

+	"$(INTDIR)\FILE_IO.obj" \

+	"$(INTDIR)\Get_Opt.obj" \

+	"$(INTDIR)\Handle_Set.obj" \

+	"$(INTDIR)\High_Res_Timer.obj" \

+	"$(INTDIR)\INET_Addr.obj" \

+	"$(INTDIR)\IO_Cntl_Msg.obj" \

+	"$(INTDIR)\IO_SAP.obj" \

+	"$(INTDIR)\IPC_SAP.obj" \

+	"$(INTDIR)\Local_Name_Space.obj" \

+	"$(INTDIR)\Local_Tokens.obj" \

+	"$(INTDIR)\Log_Msg.obj" \

+	"$(INTDIR)\Log_Record.obj" \

+	"$(INTDIR)\LSOCK.obj" \

+	"$(INTDIR)\LSOCK_Acceptor.obj" \

+	"$(INTDIR)\LSOCK_CODgram.obj" \

+	"$(INTDIR)\LSOCK_Connector.obj" \

+	"$(INTDIR)\LSOCK_Dgram.obj" \

+	"$(INTDIR)\LSOCK_Stream.obj" \

+	"$(INTDIR)\Malloc.obj" \

+	"$(INTDIR)\Mem_Map.obj" \

+	"$(INTDIR)\Memory_Pool.obj" \

+	"$(INTDIR)\Message_Block.obj" \

+	"$(INTDIR)\Method_Object.obj" \

+	"$(INTDIR)\Multiplexor.obj" \

+	"$(INTDIR)\Name_Proxy.obj" \

+	"$(INTDIR)\Name_Request_Reply.obj" \

+	"$(INTDIR)\Name_Space.obj" \

+	"$(INTDIR)\Naming_Context.obj" \

+	"$(INTDIR)\Obstack.obj" \

+	"$(INTDIR)\OS.obj" \

+	"$(INTDIR)\Parse_Node.obj" \

+	"$(INTDIR)\Pipe.obj" \

+	"$(INTDIR)\Proactor.obj" \

+	"$(INTDIR)\Process.obj" \

+	"$(INTDIR)\Process_Manager.obj" \

+	"$(INTDIR)\Profile_Timer.obj" \

+	"$(INTDIR)\Reactor.obj" \

+	"$(INTDIR)\ReactorEx.obj" \

+	"$(INTDIR)\Read_Buffer.obj" \

+	"$(INTDIR)\Registry.obj" \

+	"$(INTDIR)\Remote_Name_Space.obj" \

+	"$(INTDIR)\Remote_Tokens.obj" \

+	"$(INTDIR)\Service_Config.obj" \

+	"$(INTDIR)\Service_Main.obj" \

+	"$(INTDIR)\Service_Manager.obj" \

+	"$(INTDIR)\Service_Object.obj" \

+	"$(INTDIR)\Service_Record.obj" \

+	"$(INTDIR)\Service_Repository.obj" \

+	"$(INTDIR)\Shared_Memory_MM.obj" \

+	"$(INTDIR)\Shared_Memory_SV.obj" \

+	"$(INTDIR)\Shared_Object.obj" \

+	"$(INTDIR)\Signal.obj" \

+	"$(INTDIR)\SOCK.obj" \

+	"$(INTDIR)\SOCK_Acceptor.obj" \

+	"$(INTDIR)\SOCK_CODgram.obj" \

+	"$(INTDIR)\SOCK_Connector.obj" \

+	"$(INTDIR)\SOCK_Dgram.obj" \

+	"$(INTDIR)\SOCK_Dgram_Bcast.obj" \

+	"$(INTDIR)\SOCK_Dgram_Mcast.obj" \

+	"$(INTDIR)\SOCK_IO.obj" \

+	"$(INTDIR)\SOCK_Stream.obj" \

+	"$(INTDIR)\SPIPE.obj" \

+	"$(INTDIR)\SPIPE_Acceptor.obj" \

+	"$(INTDIR)\SPIPE_Addr.obj" \

+	"$(INTDIR)\SPIPE_Connector.obj" \

+	"$(INTDIR)\SPIPE_Stream.obj" \

+	"$(INTDIR)\SString.obj" \

+	"$(INTDIR)\SV_Message.obj" \

+	"$(INTDIR)\SV_Message_Queue.obj" \

+	"$(INTDIR)\SV_Semaphore_Complex.obj" \

+	"$(INTDIR)\SV_Semaphore_Simple.obj" \

+	"$(INTDIR)\SV_Shared_Memory.obj" \

+	"$(INTDIR)\Svc_Conf_l.obj" \

+	"$(INTDIR)\Svc_Conf_y.obj" \

+	"$(INTDIR)\Synch.obj" \

+	"$(INTDIR)\Synch_Options.obj" \

+	"$(INTDIR)\System_Time.obj" \

+	"$(INTDIR)\Task.obj" \

+	"$(INTDIR)\Thread.obj" \

+	"$(INTDIR)\Thread_Manager.obj" \

+	"$(INTDIR)\Time_Request_Reply.obj" \

+	"$(INTDIR)\Time_Value.obj" \

+	"$(INTDIR)\Timer_Queue.obj" \

+	"$(INTDIR)\TLI.obj" \

+	"$(INTDIR)\TLI_Acceptor.obj" \

+	"$(INTDIR)\TLI_Connector.obj" \

+	"$(INTDIR)\TLI_Stream.obj" \

+	"$(INTDIR)\Token.obj" \

+	"$(INTDIR)\Token_Collection.obj" \

+	"$(INTDIR)\Token_Invariants.obj" \

+	"$(INTDIR)\Token_Manager.obj" \

+	"$(INTDIR)\Token_Request_Reply.obj" \

+	"$(INTDIR)\Trace.obj" \

+	"$(INTDIR)\TTY_IO.obj" \

+	"$(INTDIR)\UNIX_Addr.obj" \

+	"$(INTDIR)\UPIPE_Acceptor.obj" \

+	"$(INTDIR)\UPIPE_Connector.obj" \

+	"$(INTDIR)\UPIPE_Stream.obj"

+=======
 	"$(INTDIR)/TLI_Acceptor.obj" \

 	"$(INTDIR)/DEV_Addr.obj" \

 	"$(INTDIR)/SOCK_CODgram.obj" \

@@ -325,6 +572,7 @@ LINK32_OBJS= \
 	"$(INTDIR)/FIFO_Send.obj" \

 	"$(INTDIR)/SV_Semaphore_Complex.obj" \

 	"$(INTDIR)/Strategies.obj"

+>>>>>>> 4.8
 

 "$(OUTDIR)\ace.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

     $(LINK32) @<<

@@ -349,6 +597,134 @@ INTDIR=.\Debug
 ALL : "$(OUTDIR)\ace.dll"

 

 CLEAN : 

+<<<<<<< ace.mak
+	-@erase "$(INTDIR)\ACE.obj"

+	-@erase "$(INTDIR)\Activation_Queue.obj"

+	-@erase "$(INTDIR)\Addr.obj"

+	-@erase "$(INTDIR)\ARGV.obj"

+	-@erase "$(INTDIR)\CORBA_Handler.obj"

+	-@erase "$(INTDIR)\Date_Time.obj"

+	-@erase "$(INTDIR)\DEV.obj"

+	-@erase "$(INTDIR)\DEV_Addr.obj"

+	-@erase "$(INTDIR)\DEV_Connector.obj"

+	-@erase "$(INTDIR)\DEV_IO.obj"

+	-@erase "$(INTDIR)\Dump.obj"

+	-@erase "$(INTDIR)\Dynamic.obj"

+	-@erase "$(INTDIR)\Event_Handler.obj"

+	-@erase "$(INTDIR)\FIFO.obj"

+	-@erase "$(INTDIR)\FIFO_Recv.obj"

+	-@erase "$(INTDIR)\FIFO_Recv_Msg.obj"

+	-@erase "$(INTDIR)\FIFO_Send.obj"

+	-@erase "$(INTDIR)\FIFO_Send_Msg.obj"

+	-@erase "$(INTDIR)\FILE.obj"

+	-@erase "$(INTDIR)\FILE_Addr.obj"

+	-@erase "$(INTDIR)\FILE_Connector.obj"

+	-@erase "$(INTDIR)\FILE_IO.obj"

+	-@erase "$(INTDIR)\Get_Opt.obj"

+	-@erase "$(INTDIR)\Handle_Set.obj"

+	-@erase "$(INTDIR)\High_Res_Timer.obj"

+	-@erase "$(INTDIR)\INET_Addr.obj"

+	-@erase "$(INTDIR)\IO_Cntl_Msg.obj"

+	-@erase "$(INTDIR)\IO_SAP.obj"

+	-@erase "$(INTDIR)\IPC_SAP.obj"

+	-@erase "$(INTDIR)\Local_Name_Space.obj"

+	-@erase "$(INTDIR)\Local_Tokens.obj"

+	-@erase "$(INTDIR)\Log_Msg.obj"

+	-@erase "$(INTDIR)\Log_Record.obj"

+	-@erase "$(INTDIR)\LSOCK.obj"

+	-@erase "$(INTDIR)\LSOCK_Acceptor.obj"

+	-@erase "$(INTDIR)\LSOCK_CODgram.obj"

+	-@erase "$(INTDIR)\LSOCK_Connector.obj"

+	-@erase "$(INTDIR)\LSOCK_Dgram.obj"

+	-@erase "$(INTDIR)\LSOCK_Stream.obj"

+	-@erase "$(INTDIR)\Malloc.obj"

+	-@erase "$(INTDIR)\Mem_Map.obj"

+	-@erase "$(INTDIR)\Memory_Pool.obj"

+	-@erase "$(INTDIR)\Message_Block.obj"

+	-@erase "$(INTDIR)\Method_Object.obj"

+	-@erase "$(INTDIR)\Multiplexor.obj"

+	-@erase "$(INTDIR)\Name_Proxy.obj"

+	-@erase "$(INTDIR)\Name_Request_Reply.obj"

+	-@erase "$(INTDIR)\Name_Space.obj"

+	-@erase "$(INTDIR)\Naming_Context.obj"

+	-@erase "$(INTDIR)\Obstack.obj"

+	-@erase "$(INTDIR)\OS.obj"

+	-@erase "$(INTDIR)\Parse_Node.obj"

+	-@erase "$(INTDIR)\Pipe.obj"

+	-@erase "$(INTDIR)\Proactor.obj"

+	-@erase "$(INTDIR)\Process.obj"

+	-@erase "$(INTDIR)\Process_Manager.obj"

+	-@erase "$(INTDIR)\Profile_Timer.obj"

+	-@erase "$(INTDIR)\Reactor.obj"

+	-@erase "$(INTDIR)\ReactorEx.obj"

+	-@erase "$(INTDIR)\Read_Buffer.obj"

+	-@erase "$(INTDIR)\Registry.obj"

+	-@erase "$(INTDIR)\Remote_Name_Space.obj"

+	-@erase "$(INTDIR)\Remote_Tokens.obj"

+	-@erase "$(INTDIR)\Service_Config.obj"

+	-@erase "$(INTDIR)\Service_Main.obj"

+	-@erase "$(INTDIR)\Service_Manager.obj"

+	-@erase "$(INTDIR)\Service_Object.obj"

+	-@erase "$(INTDIR)\Service_Record.obj"

+	-@erase "$(INTDIR)\Service_Repository.obj"

+	-@erase "$(INTDIR)\Shared_Memory_MM.obj"

+	-@erase "$(INTDIR)\Shared_Memory_SV.obj"

+	-@erase "$(INTDIR)\Shared_Object.obj"

+	-@erase "$(INTDIR)\Signal.obj"

+	-@erase "$(INTDIR)\SOCK.obj"

+	-@erase "$(INTDIR)\SOCK_Acceptor.obj"

+	-@erase "$(INTDIR)\SOCK_CODgram.obj"

+	-@erase "$(INTDIR)\SOCK_Connector.obj"

+	-@erase "$(INTDIR)\SOCK_Dgram.obj"

+	-@erase "$(INTDIR)\SOCK_Dgram_Bcast.obj"

+	-@erase "$(INTDIR)\SOCK_Dgram_Mcast.obj"

+	-@erase "$(INTDIR)\SOCK_IO.obj"

+	-@erase "$(INTDIR)\SOCK_Stream.obj"

+	-@erase "$(INTDIR)\SPIPE.obj"

+	-@erase "$(INTDIR)\SPIPE_Acceptor.obj"

+	-@erase "$(INTDIR)\SPIPE_Addr.obj"

+	-@erase "$(INTDIR)\SPIPE_Connector.obj"

+	-@erase "$(INTDIR)\SPIPE_Stream.obj"

+	-@erase "$(INTDIR)\SString.obj"

+	-@erase "$(INTDIR)\SV_Message.obj"

+	-@erase "$(INTDIR)\SV_Message_Queue.obj"

+	-@erase "$(INTDIR)\SV_Semaphore_Complex.obj"

+	-@erase "$(INTDIR)\SV_Semaphore_Simple.obj"

+	-@erase "$(INTDIR)\SV_Shared_Memory.obj"

+	-@erase "$(INTDIR)\Svc_Conf_l.obj"

+	-@erase "$(INTDIR)\Svc_Conf_y.obj"

+	-@erase "$(INTDIR)\Synch.obj"

+	-@erase "$(INTDIR)\Synch_Options.obj"

+	-@erase "$(INTDIR)\System_Time.obj"

+	-@erase "$(INTDIR)\Task.obj"

+	-@erase "$(INTDIR)\Thread.obj"

+	-@erase "$(INTDIR)\Thread_Manager.obj"

+	-@erase "$(INTDIR)\Time_Request_Reply.obj"

+	-@erase "$(INTDIR)\Time_Value.obj"

+	-@erase "$(INTDIR)\Timer_Queue.obj"

+	-@erase "$(INTDIR)\TLI.obj"

+	-@erase "$(INTDIR)\TLI_Acceptor.obj"

+	-@erase "$(INTDIR)\TLI_Connector.obj"

+	-@erase "$(INTDIR)\TLI_Stream.obj"

+	-@erase "$(INTDIR)\Token.obj"

+	-@erase "$(INTDIR)\Token_Collection.obj"

+	-@erase "$(INTDIR)\Token_Invariants.obj"

+	-@erase "$(INTDIR)\Token_Manager.obj"

+	-@erase "$(INTDIR)\Token_Request_Reply.obj"

+	-@erase "$(INTDIR)\Trace.obj"

+	-@erase "$(INTDIR)\TTY_IO.obj"

+	-@erase "$(INTDIR)\UNIX_Addr.obj"

+	-@erase "$(INTDIR)\UPIPE_Acceptor.obj"

+	-@erase "$(INTDIR)\UPIPE_Connector.obj"

+	-@erase "$(INTDIR)\UPIPE_Stream.obj"

+	-@erase "$(INTDIR)\vc40.idb"

+	-@erase "$(INTDIR)\vc40.pdb"

+	-@erase "$(OUTDIR)\ace.dll"

+	-@erase "$(OUTDIR)\ace.exp"

+	-@erase "$(OUTDIR)\ace.ilk"

+	-@erase "$(OUTDIR)\ace.lib"

+	-@erase "$(OUTDIR)\ace.pdb"

+=======
 	-@erase ".\Debug\vc40.pdb"

 	-@erase ".\Debug\vc40.idb"

 	-@erase ".\ace.dll"

@@ -476,6 +852,7 @@ CLEAN :
 	-@erase ".\ace.lib"

 	-@erase ".\ace.exp"

 	-@erase ".\ace.pdb"

+>>>>>>> 4.8
 

 "$(INTDIR)" :

     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

@@ -485,7 +862,7 @@ CLEAN :
 CPP_PROJ=/nologo /MDd /W3 /Gm /Zi /Od /I "..\STL" /D "WIN32" /D "_DEBUG" /D\

  "_WINDOWS" /Fp"$(INTDIR)/ace.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 

 CPP_OBJS=.\Debug/

-CPP_SBRS=

+CPP_SBRS=.\.

 # ADD BASE MTL /nologo /D "_DEBUG" /win32

 # ADD MTL /nologo /D "_DEBUG" /win32

 MTL_PROJ=/nologo /D "_DEBUG" /win32 

@@ -495,7 +872,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 BSC32_FLAGS=/nologo /o"$(OUTDIR)/ace.bsc" 

-BSC32_SBRS=

+BSC32_SBRS= \

+	

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386

 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib advapi32.lib /nologo /subsystem:windows /dll /debug /machine:I386

@@ -505,6 +883,127 @@ LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
  /incremental:yes /pdb:"$(OUTDIR)/ace.pdb" /debug /machine:I386\

  /out:"$(OUTDIR)/ace.dll" /implib:"$(OUTDIR)/ace.lib" 

 LINK32_OBJS= \

+<<<<<<< ace.mak
+	"$(INTDIR)\ACE.obj" \

+	"$(INTDIR)\Activation_Queue.obj" \

+	"$(INTDIR)\Addr.obj" \

+	"$(INTDIR)\ARGV.obj" \

+	"$(INTDIR)\CORBA_Handler.obj" \

+	"$(INTDIR)\Date_Time.obj" \

+	"$(INTDIR)\DEV.obj" \

+	"$(INTDIR)\DEV_Addr.obj" \

+	"$(INTDIR)\DEV_Connector.obj" \

+	"$(INTDIR)\DEV_IO.obj" \

+	"$(INTDIR)\Dump.obj" \

+	"$(INTDIR)\Dynamic.obj" \

+	"$(INTDIR)\Event_Handler.obj" \

+	"$(INTDIR)\FIFO.obj" \

+	"$(INTDIR)\FIFO_Recv.obj" \

+	"$(INTDIR)\FIFO_Recv_Msg.obj" \

+	"$(INTDIR)\FIFO_Send.obj" \

+	"$(INTDIR)\FIFO_Send_Msg.obj" \

+	"$(INTDIR)\FILE.obj" \

+	"$(INTDIR)\FILE_Addr.obj" \

+	"$(INTDIR)\FILE_Connector.obj" \

+	"$(INTDIR)\FILE_IO.obj" \

+	"$(INTDIR)\Get_Opt.obj" \

+	"$(INTDIR)\Handle_Set.obj" \

+	"$(INTDIR)\High_Res_Timer.obj" \

+	"$(INTDIR)\INET_Addr.obj" \

+	"$(INTDIR)\IO_Cntl_Msg.obj" \

+	"$(INTDIR)\IO_SAP.obj" \

+	"$(INTDIR)\IPC_SAP.obj" \

+	"$(INTDIR)\Local_Name_Space.obj" \

+	"$(INTDIR)\Local_Tokens.obj" \

+	"$(INTDIR)\Log_Msg.obj" \

+	"$(INTDIR)\Log_Record.obj" \

+	"$(INTDIR)\LSOCK.obj" \

+	"$(INTDIR)\LSOCK_Acceptor.obj" \

+	"$(INTDIR)\LSOCK_CODgram.obj" \

+	"$(INTDIR)\LSOCK_Connector.obj" \

+	"$(INTDIR)\LSOCK_Dgram.obj" \

+	"$(INTDIR)\LSOCK_Stream.obj" \

+	"$(INTDIR)\Malloc.obj" \

+	"$(INTDIR)\Mem_Map.obj" \

+	"$(INTDIR)\Memory_Pool.obj" \

+	"$(INTDIR)\Message_Block.obj" \

+	"$(INTDIR)\Method_Object.obj" \

+	"$(INTDIR)\Multiplexor.obj" \

+	"$(INTDIR)\Name_Proxy.obj" \

+	"$(INTDIR)\Name_Request_Reply.obj" \

+	"$(INTDIR)\Name_Space.obj" \

+	"$(INTDIR)\Naming_Context.obj" \

+	"$(INTDIR)\Obstack.obj" \

+	"$(INTDIR)\OS.obj" \

+	"$(INTDIR)\Parse_Node.obj" \

+	"$(INTDIR)\Pipe.obj" \

+	"$(INTDIR)\Proactor.obj" \

+	"$(INTDIR)\Process.obj" \

+	"$(INTDIR)\Process_Manager.obj" \

+	"$(INTDIR)\Profile_Timer.obj" \

+	"$(INTDIR)\Reactor.obj" \

+	"$(INTDIR)\ReactorEx.obj" \

+	"$(INTDIR)\Read_Buffer.obj" \

+	"$(INTDIR)\Registry.obj" \

+	"$(INTDIR)\Remote_Name_Space.obj" \

+	"$(INTDIR)\Remote_Tokens.obj" \

+	"$(INTDIR)\Service_Config.obj" \

+	"$(INTDIR)\Service_Main.obj" \

+	"$(INTDIR)\Service_Manager.obj" \

+	"$(INTDIR)\Service_Object.obj" \

+	"$(INTDIR)\Service_Record.obj" \

+	"$(INTDIR)\Service_Repository.obj" \

+	"$(INTDIR)\Shared_Memory_MM.obj" \

+	"$(INTDIR)\Shared_Memory_SV.obj" \

+	"$(INTDIR)\Shared_Object.obj" \

+	"$(INTDIR)\Signal.obj" \

+	"$(INTDIR)\SOCK.obj" \

+	"$(INTDIR)\SOCK_Acceptor.obj" \

+	"$(INTDIR)\SOCK_CODgram.obj" \

+	"$(INTDIR)\SOCK_Connector.obj" \

+	"$(INTDIR)\SOCK_Dgram.obj" \

+	"$(INTDIR)\SOCK_Dgram_Bcast.obj" \

+	"$(INTDIR)\SOCK_Dgram_Mcast.obj" \

+	"$(INTDIR)\SOCK_IO.obj" \

+	"$(INTDIR)\SOCK_Stream.obj" \

+	"$(INTDIR)\SPIPE.obj" \

+	"$(INTDIR)\SPIPE_Acceptor.obj" \

+	"$(INTDIR)\SPIPE_Addr.obj" \

+	"$(INTDIR)\SPIPE_Connector.obj" \

+	"$(INTDIR)\SPIPE_Stream.obj" \

+	"$(INTDIR)\SString.obj" \

+	"$(INTDIR)\SV_Message.obj" \

+	"$(INTDIR)\SV_Message_Queue.obj" \

+	"$(INTDIR)\SV_Semaphore_Complex.obj" \

+	"$(INTDIR)\SV_Semaphore_Simple.obj" \

+	"$(INTDIR)\SV_Shared_Memory.obj" \

+	"$(INTDIR)\Svc_Conf_l.obj" \

+	"$(INTDIR)\Svc_Conf_y.obj" \

+	"$(INTDIR)\Synch.obj" \

+	"$(INTDIR)\Synch_Options.obj" \

+	"$(INTDIR)\System_Time.obj" \

+	"$(INTDIR)\Task.obj" \

+	"$(INTDIR)\Thread.obj" \

+	"$(INTDIR)\Thread_Manager.obj" \

+	"$(INTDIR)\Time_Request_Reply.obj" \

+	"$(INTDIR)\Time_Value.obj" \

+	"$(INTDIR)\Timer_Queue.obj" \

+	"$(INTDIR)\TLI.obj" \

+	"$(INTDIR)\TLI_Acceptor.obj" \

+	"$(INTDIR)\TLI_Connector.obj" \

+	"$(INTDIR)\TLI_Stream.obj" \

+	"$(INTDIR)\Token.obj" \

+	"$(INTDIR)\Token_Collection.obj" \

+	"$(INTDIR)\Token_Invariants.obj" \

+	"$(INTDIR)\Token_Manager.obj" \

+	"$(INTDIR)\Token_Request_Reply.obj" \

+	"$(INTDIR)\Trace.obj" \

+	"$(INTDIR)\TTY_IO.obj" \

+	"$(INTDIR)\UNIX_Addr.obj" \

+	"$(INTDIR)\UPIPE_Acceptor.obj" \

+	"$(INTDIR)\UPIPE_Connector.obj" \

+	"$(INTDIR)\UPIPE_Stream.obj"

+=======
 	"$(INTDIR)/DEV_Connector.obj" \

 	"$(INTDIR)/Svc_Conf_y.obj" \

 	"$(INTDIR)/SV_Semaphore_Complex.obj" \

@@ -625,6 +1124,7 @@ LINK32_OBJS= \
 	"$(INTDIR)/Profile_Timer.obj" \

 	"$(INTDIR)/Thread.obj" \

 	"$(INTDIR)/Strategies.obj"

+>>>>>>> 4.8
 

 "$(OUTDIR)\ace.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

     $(LINK32) @<<

@@ -667,7 +1167,132 @@ LINK32_OBJS= \
 # Begin Source File

 

 SOURCE=.\UPIPE_Stream.cpp

+<<<<<<< ace.mak
+

+!IF  "$(CFG)" == "ace - Win32 Release"

+

+=======
+>>>>>>> 4.8
 DEP_CPP_UPIPE=\

+<<<<<<< ace.mak
+	{$(INCLUDE)}"\ace\ACE.h"\

+	{$(INCLUDE)}"\ace\ACE.i"\

+	{$(INCLUDE)}"\ace\Addr.h"\

+	{$(INCLUDE)}"\ace\Addr.i"\

+	{$(INCLUDE)}"\ace\config.h"\

+	{$(INCLUDE)}"\ace\Event_Handler.h"\

+	{$(INCLUDE)}"\ace\Event_Handler.i"\

+	{$(INCLUDE)}"\ace\Handle_Set.h"\

+	{$(INCLUDE)}"\ace\Handle_Set.i"\

+	{$(INCLUDE)}"\ace\INET_Addr.h"\

+	{$(INCLUDE)}"\ace\INET_Addr.i"\

+	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

+	{$(INCLUDE)}"\ace\IPC_SAP.h"\

+	{$(INCLUDE)}"\ace\IPC_SAP.i"\

+	{$(INCLUDE)}"\ace\Local_Tokens.h"\

+	{$(INCLUDE)}"\ace\Local_Tokens.i"\

+	{$(INCLUDE)}"\ace\Log_Msg.h"\

+	{$(INCLUDE)}"\ace\Log_Priority.h"\

+	{$(INCLUDE)}"\ace\Log_Record.h"\

+	{$(INCLUDE)}"\ace\Log_Record.i"\

+	{$(INCLUDE)}"\ace\Malloc.h"\

+	{$(INCLUDE)}"\ace\Malloc.i"\

+	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

+	{$(INCLUDE)}"\ace\Malloc_T.h"\

+	{$(INCLUDE)}"\ace\Malloc_T.i"\

+	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

+	{$(INCLUDE)}"\ace\Map_Manager.h"\

+	{$(INCLUDE)}"\ace\Map_Manager.i"\

+	{$(INCLUDE)}"\ace\Mem_Map.h"\

+	{$(INCLUDE)}"\ace\Mem_Map.i"\

+	{$(INCLUDE)}"\ace\Memory_Pool.h"\

+	{$(INCLUDE)}"\ace\Memory_Pool.i"\

+	{$(INCLUDE)}"\ace\Message_Block.h"\

+	{$(INCLUDE)}"\ace\Message_Block.i"\

+	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

+	{$(INCLUDE)}"\ace\Message_Queue.h"\

+	{$(INCLUDE)}"\ace\Message_Queue.i"\

+	{$(INCLUDE)}"\ace\Module.cpp"\

+	{$(INCLUDE)}"\ace\Module.h"\

+	{$(INCLUDE)}"\ace\Module.i"\

+	{$(INCLUDE)}"\ace\OS.h"\

+	{$(INCLUDE)}"\ace\OS.i"\

+	{$(INCLUDE)}"\ace\Pipe.h"\

+	{$(INCLUDE)}"\ace\Pipe.i"\

+	{$(INCLUDE)}"\ace\Proactor.h"\

+	{$(INCLUDE)}"\ace\Proactor.i"\

+	{$(INCLUDE)}"\ace\Reactor.h"\

+	{$(INCLUDE)}"\ace\Reactor.i"\

+	{$(INCLUDE)}"\ace\ReactorEx.h"\

+	{$(INCLUDE)}"\ace\ReactorEx.i"\

+	{$(INCLUDE)}"\ace\Service_Config.h"\

+	{$(INCLUDE)}"\ace\Service_Config.i"\

+	{$(INCLUDE)}"\ace\Service_Object.h"\

+	{$(INCLUDE)}"\ace\Service_Object.i"\

+	{$(INCLUDE)}"\ace\Set.cpp"\

+	{$(INCLUDE)}"\ace\Set.h"\

+	{$(INCLUDE)}"\ace\Set.i"\

+	{$(INCLUDE)}"\ace\Shared_Object.h"\

+	{$(INCLUDE)}"\ace\Shared_Object.i"\

+	{$(INCLUDE)}"\ace\Signal.h"\

+	{$(INCLUDE)}"\ace\Signal.i"\

+	{$(INCLUDE)}"\ace\SOCK.h"\

+	{$(INCLUDE)}"\ace\SOCK.i"\

+	{$(INCLUDE)}"\ace\SOCK_IO.h"\

+	{$(INCLUDE)}"\ace\SOCK_IO.i"\

+	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

+	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

+	{$(INCLUDE)}"\ace\SPIPE.h"\

+	{$(INCLUDE)}"\ace\SPIPE.i"\

+	{$(INCLUDE)}"\ace\SPIPE_Addr.h"\

+	{$(INCLUDE)}"\ace\SPIPE_Addr.i"\

+	{$(INCLUDE)}"\ace\Stack.cpp"\

+	{$(INCLUDE)}"\ace\Stack.h"\

+	{$(INCLUDE)}"\ace\Stack.i"\

+	{$(INCLUDE)}"\ace\Stream.cpp"\

+	{$(INCLUDE)}"\ace\Stream.h"\

+	{$(INCLUDE)}"\ace\Stream.i"\

+	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

+	{$(INCLUDE)}"\ace\Stream_Modules.h"\

+	{$(INCLUDE)}"\ace\Stream_Modules.i"\

+	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

+	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

+	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

+	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

+	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

+	{$(INCLUDE)}"\ace\Synch.h"\

+	{$(INCLUDE)}"\ace\Synch.i"\

+	{$(INCLUDE)}"\ace\Synch_Options.h"\

+	{$(INCLUDE)}"\ace\Synch_T.cpp"\

+	{$(INCLUDE)}"\ace\Synch_T.h"\

+	{$(INCLUDE)}"\ace\Synch_T.i"\

+	{$(INCLUDE)}"\ace\Task.cpp"\

+	{$(INCLUDE)}"\ace\Task.h"\

+	{$(INCLUDE)}"\ace\Task.i"\

+	{$(INCLUDE)}"\ace\Thread.h"\

+	{$(INCLUDE)}"\ace\Thread.i"\

+	{$(INCLUDE)}"\ace\Thread_Manager.h"\

+	{$(INCLUDE)}"\ace\Thread_Manager.i"\

+	{$(INCLUDE)}"\ace\Time_Value.h"\

+	{$(INCLUDE)}"\ace\Time_Value.i"\

+	{$(INCLUDE)}"\ace\Timer_Queue.h"\

+	{$(INCLUDE)}"\ace\Timer_Queue.i"\

+	{$(INCLUDE)}"\ace\Token.h"\

+	{$(INCLUDE)}"\ace\Token.i"\

+	{$(INCLUDE)}"\ace\Trace.h"\

+	{$(INCLUDE)}"\ace\UPIPE_Addr.h"\

+	{$(INCLUDE)}"\ace\UPIPE_Stream.h"\

+	{$(INCLUDE)}"\ace\UPIPE_Stream.i"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_UPIPE=\

+	"c:\ace_wrappers\ace\ace\Sync_T.h"\

+=======
 	{$(INCLUDE)}"\.\UPIPE_Stream.h"\

 	{$(INCLUDE)}"\.\UPIPE_Stream.i"\

 	{$(INCLUDE)}"\.\Stream.h"\

@@ -783,17 +1408,273 @@ DEP_CPP_UPIPE=\
 	{$(INCLUDE)}"\.\Message_Queue.cpp"\

 	{$(INCLUDE)}"\.\Strategies_T.h"\

 	{$(INCLUDE)}"\.\Strategies_T.cpp"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\UPIPE_Stream.obj" : $(SOURCE) $(DEP_CPP_UPIPE) "$(INTDIR)"

 

 

+<<<<<<< ace.mak
+!ELSEIF  "$(CFG)" == "ace - Win32 Debug"

+

+DEP_CPP_UPIPE=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Queue.cpp"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\Stream.cpp"\

+	".\Stream.h"\

+	".\Stream.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	".\UPIPE_Addr.h"\

+	".\UPIPE_Stream.h"\

+	".\UPIPE_Stream.i"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_UPIPE=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+	

+

+"$(INTDIR)\UPIPE_Stream.obj" : $(SOURCE) $(DEP_CPP_UPIPE) "$(INTDIR)"

+

+

+!ENDIF 

+

+=======
+>>>>>>> 4.8
 # End Source File

 ################################################################################

 # Begin Source File

 

 SOURCE=.\UPIPE_Connector.cpp

 DEP_CPP_UPIPE_=\

+<<<<<<< ace.mak
+	{$(INCLUDE)}"\ace\ACE.h"\

+	{$(INCLUDE)}"\ace\ACE.i"\

+	{$(INCLUDE)}"\ace\Addr.h"\

+	{$(INCLUDE)}"\ace\Addr.i"\

+	{$(INCLUDE)}"\ace\config.h"\

+	{$(INCLUDE)}"\ace\Event_Handler.h"\

+	{$(INCLUDE)}"\ace\Event_Handler.i"\

+	{$(INCLUDE)}"\ace\Handle_Set.h"\

+	{$(INCLUDE)}"\ace\Handle_Set.i"\

+	{$(INCLUDE)}"\ace\INET_Addr.h"\

+	{$(INCLUDE)}"\ace\INET_Addr.i"\

+	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

+	{$(INCLUDE)}"\ace\IPC_SAP.h"\

+	{$(INCLUDE)}"\ace\IPC_SAP.i"\

+	{$(INCLUDE)}"\ace\Local_Tokens.h"\

+	{$(INCLUDE)}"\ace\Local_Tokens.i"\

+	{$(INCLUDE)}"\ace\Log_Msg.h"\

+	{$(INCLUDE)}"\ace\Log_Priority.h"\

+	{$(INCLUDE)}"\ace\Log_Record.h"\

+	{$(INCLUDE)}"\ace\Log_Record.i"\

+	{$(INCLUDE)}"\ace\Malloc.h"\

+	{$(INCLUDE)}"\ace\Malloc.i"\

+	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

+	{$(INCLUDE)}"\ace\Malloc_T.h"\

+	{$(INCLUDE)}"\ace\Malloc_T.i"\

+	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

+	{$(INCLUDE)}"\ace\Map_Manager.h"\

+	{$(INCLUDE)}"\ace\Map_Manager.i"\

+	{$(INCLUDE)}"\ace\Mem_Map.h"\

+	{$(INCLUDE)}"\ace\Mem_Map.i"\

+	{$(INCLUDE)}"\ace\Memory_Pool.h"\

+	{$(INCLUDE)}"\ace\Memory_Pool.i"\

+	{$(INCLUDE)}"\ace\Message_Block.h"\

+	{$(INCLUDE)}"\ace\Message_Block.i"\

+	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

+	{$(INCLUDE)}"\ace\Message_Queue.h"\

+	{$(INCLUDE)}"\ace\Message_Queue.i"\

+	{$(INCLUDE)}"\ace\Module.cpp"\

+	{$(INCLUDE)}"\ace\Module.h"\

+	{$(INCLUDE)}"\ace\Module.i"\

+	{$(INCLUDE)}"\ace\OS.h"\

+	{$(INCLUDE)}"\ace\OS.i"\

+	{$(INCLUDE)}"\ace\Pipe.h"\

+	{$(INCLUDE)}"\ace\Pipe.i"\

+	{$(INCLUDE)}"\ace\Proactor.h"\

+	{$(INCLUDE)}"\ace\Proactor.i"\

+	{$(INCLUDE)}"\ace\Reactor.h"\

+	{$(INCLUDE)}"\ace\Reactor.i"\

+	{$(INCLUDE)}"\ace\ReactorEx.h"\

+	{$(INCLUDE)}"\ace\ReactorEx.i"\

+	{$(INCLUDE)}"\ace\Service_Config.h"\

+	{$(INCLUDE)}"\ace\Service_Config.i"\

+	{$(INCLUDE)}"\ace\Service_Object.h"\

+	{$(INCLUDE)}"\ace\Service_Object.i"\

+	{$(INCLUDE)}"\ace\Set.cpp"\

+	{$(INCLUDE)}"\ace\Set.h"\

+	{$(INCLUDE)}"\ace\Set.i"\

+	{$(INCLUDE)}"\ace\Shared_Object.h"\

+	{$(INCLUDE)}"\ace\Shared_Object.i"\

+	{$(INCLUDE)}"\ace\Signal.h"\

+	{$(INCLUDE)}"\ace\Signal.i"\

+	{$(INCLUDE)}"\ace\SOCK.h"\

+	{$(INCLUDE)}"\ace\SOCK.i"\

+	{$(INCLUDE)}"\ace\SOCK_IO.h"\

+	{$(INCLUDE)}"\ace\SOCK_IO.i"\

+	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

+	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

+	{$(INCLUDE)}"\ace\SPIPE.h"\

+	{$(INCLUDE)}"\ace\SPIPE.i"\

+	{$(INCLUDE)}"\ace\SPIPE_Addr.h"\

+	{$(INCLUDE)}"\ace\SPIPE_Addr.i"\

+	{$(INCLUDE)}"\ace\SPIPE_Stream.h"\

+	{$(INCLUDE)}"\ace\SPIPE_Stream.i"\

+	{$(INCLUDE)}"\ace\Stack.cpp"\

+	{$(INCLUDE)}"\ace\Stack.h"\

+	{$(INCLUDE)}"\ace\Stack.i"\

+	{$(INCLUDE)}"\ace\Stream.cpp"\

+	{$(INCLUDE)}"\ace\Stream.h"\

+	{$(INCLUDE)}"\ace\Stream.i"\

+	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

+	{$(INCLUDE)}"\ace\Stream_Modules.h"\

+	{$(INCLUDE)}"\ace\Stream_Modules.i"\

+	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

+	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

+	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

+	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

+	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

+	{$(INCLUDE)}"\ace\Synch.h"\

+	{$(INCLUDE)}"\ace\Synch.i"\

+	{$(INCLUDE)}"\ace\Synch_Options.h"\

+	{$(INCLUDE)}"\ace\Synch_T.cpp"\

+	{$(INCLUDE)}"\ace\Synch_T.h"\

+	{$(INCLUDE)}"\ace\Synch_T.i"\

+	{$(INCLUDE)}"\ace\Task.cpp"\

+	{$(INCLUDE)}"\ace\Task.h"\

+	{$(INCLUDE)}"\ace\Task.i"\

+	{$(INCLUDE)}"\ace\Thread.h"\

+	{$(INCLUDE)}"\ace\Thread.i"\

+	{$(INCLUDE)}"\ace\Thread_Manager.h"\

+	{$(INCLUDE)}"\ace\Thread_Manager.i"\

+	{$(INCLUDE)}"\ace\Time_Value.h"\

+	{$(INCLUDE)}"\ace\Time_Value.i"\

+	{$(INCLUDE)}"\ace\Timer_Queue.h"\

+	{$(INCLUDE)}"\ace\Timer_Queue.i"\

+	{$(INCLUDE)}"\ace\Token.h"\

+	{$(INCLUDE)}"\ace\Token.i"\

+	{$(INCLUDE)}"\ace\Trace.h"\

+	{$(INCLUDE)}"\ace\UPIPE_Addr.h"\

+	{$(INCLUDE)}"\ace\UPIPE_Connector.h"\

+	{$(INCLUDE)}"\ace\UPIPE_Connector.i"\

+	{$(INCLUDE)}"\ace\UPIPE_Stream.h"\

+	{$(INCLUDE)}"\ace\UPIPE_Stream.i"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_UPIPE_=\

+	"c:\ace_wrappers\ace\ace\Sync_T.h"\

+=======
 	{$(INCLUDE)}"\.\UPIPE_Connector.h"\

 	{$(INCLUDE)}"\.\UPIPE_Stream.h"\

 	{$(INCLUDE)}"\.\Synch.h"\

@@ -913,15 +1794,416 @@ DEP_CPP_UPIPE_=\
 	{$(INCLUDE)}"\.\Strategies_T.cpp"\

 	{$(INCLUDE)}"\.\Synch.i"\

 	{$(INCLUDE)}"\.\SPIPE_Stream.i"\

+>>>>>>> 4.8
+	

+

+"$(INTDIR)\UPIPE_Connector.obj" : $(SOURCE) $(DEP_CPP_UPIPE_) "$(INTDIR)"

+

+

+<<<<<<< ace.mak
+!ELSEIF  "$(CFG)" == "ace - Win32 Debug"

+

+DEP_CPP_UPIPE_=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Queue.cpp"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SPIPE_Stream.h"\

+	".\SPIPE_Stream.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\Stream.cpp"\

+	".\Stream.h"\

+	".\Stream.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	".\UPIPE_Addr.h"\

+	".\UPIPE_Connector.h"\

+	".\UPIPE_Connector.i"\

+	".\UPIPE_Stream.h"\

+	".\UPIPE_Stream.i"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_UPIPE_=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

 	

 

 "$(INTDIR)\UPIPE_Connector.obj" : $(SOURCE) $(DEP_CPP_UPIPE_) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 ################################################################################

 # Begin Source File

+=======
+# End Source File

+################################################################################

+# Begin Source File

+>>>>>>> 4.8
+

+<<<<<<< ace.mak
+SOURCE=.\UPIPE_Acceptor.cpp

+

+!IF  "$(CFG)" == "ace - Win32 Release"

+

+DEP_CPP_UPIPE_A=\

+	{$(INCLUDE)}"\ace\ACE.h"\

+	{$(INCLUDE)}"\ace\ACE.i"\

+	{$(INCLUDE)}"\ace\Addr.h"\

+	{$(INCLUDE)}"\ace\Addr.i"\

+	{$(INCLUDE)}"\ace\config.h"\

+	{$(INCLUDE)}"\ace\Event_Handler.h"\

+	{$(INCLUDE)}"\ace\Event_Handler.i"\

+	{$(INCLUDE)}"\ace\Handle_Set.h"\

+	{$(INCLUDE)}"\ace\Handle_Set.i"\

+	{$(INCLUDE)}"\ace\INET_Addr.h"\

+	{$(INCLUDE)}"\ace\INET_Addr.i"\

+	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

+	{$(INCLUDE)}"\ace\IPC_SAP.h"\

+	{$(INCLUDE)}"\ace\IPC_SAP.i"\

+	{$(INCLUDE)}"\ace\Local_Tokens.h"\

+	{$(INCLUDE)}"\ace\Local_Tokens.i"\

+	{$(INCLUDE)}"\ace\Log_Msg.h"\

+	{$(INCLUDE)}"\ace\Log_Priority.h"\

+	{$(INCLUDE)}"\ace\Log_Record.h"\

+	{$(INCLUDE)}"\ace\Log_Record.i"\

+	{$(INCLUDE)}"\ace\Malloc.h"\

+	{$(INCLUDE)}"\ace\Malloc.i"\

+	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

+	{$(INCLUDE)}"\ace\Malloc_T.h"\

+	{$(INCLUDE)}"\ace\Malloc_T.i"\

+	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

+	{$(INCLUDE)}"\ace\Map_Manager.h"\

+	{$(INCLUDE)}"\ace\Map_Manager.i"\

+	{$(INCLUDE)}"\ace\Mem_Map.h"\

+	{$(INCLUDE)}"\ace\Mem_Map.i"\

+	{$(INCLUDE)}"\ace\Memory_Pool.h"\

+	{$(INCLUDE)}"\ace\Memory_Pool.i"\

+	{$(INCLUDE)}"\ace\Message_Block.h"\

+	{$(INCLUDE)}"\ace\Message_Block.i"\

+	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

+	{$(INCLUDE)}"\ace\Message_Queue.h"\

+	{$(INCLUDE)}"\ace\Message_Queue.i"\

+	{$(INCLUDE)}"\ace\Module.cpp"\

+	{$(INCLUDE)}"\ace\Module.h"\

+	{$(INCLUDE)}"\ace\Module.i"\

+	{$(INCLUDE)}"\ace\OS.h"\

+	{$(INCLUDE)}"\ace\OS.i"\

+	{$(INCLUDE)}"\ace\Pipe.h"\

+	{$(INCLUDE)}"\ace\Pipe.i"\

+	{$(INCLUDE)}"\ace\Proactor.h"\

+	{$(INCLUDE)}"\ace\Proactor.i"\

+	{$(INCLUDE)}"\ace\Reactor.h"\

+	{$(INCLUDE)}"\ace\Reactor.i"\

+	{$(INCLUDE)}"\ace\ReactorEx.h"\

+	{$(INCLUDE)}"\ace\ReactorEx.i"\

+	{$(INCLUDE)}"\ace\Service_Config.h"\

+	{$(INCLUDE)}"\ace\Service_Config.i"\

+	{$(INCLUDE)}"\ace\Service_Object.h"\

+	{$(INCLUDE)}"\ace\Service_Object.i"\

+	{$(INCLUDE)}"\ace\Set.cpp"\

+	{$(INCLUDE)}"\ace\Set.h"\

+	{$(INCLUDE)}"\ace\Set.i"\

+	{$(INCLUDE)}"\ace\Shared_Object.h"\

+	{$(INCLUDE)}"\ace\Shared_Object.i"\

+	{$(INCLUDE)}"\ace\Signal.h"\

+	{$(INCLUDE)}"\ace\Signal.i"\

+	{$(INCLUDE)}"\ace\SOCK.h"\

+	{$(INCLUDE)}"\ace\SOCK.i"\

+	{$(INCLUDE)}"\ace\SOCK_IO.h"\

+	{$(INCLUDE)}"\ace\SOCK_IO.i"\

+	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

+	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

+	{$(INCLUDE)}"\ace\SPIPE.h"\

+	{$(INCLUDE)}"\ace\SPIPE.i"\

+	{$(INCLUDE)}"\ace\SPIPE_Acceptor.h"\

+	{$(INCLUDE)}"\ace\SPIPE_Addr.h"\

+	{$(INCLUDE)}"\ace\SPIPE_Addr.i"\

+	{$(INCLUDE)}"\ace\SPIPE_Stream.h"\

+	{$(INCLUDE)}"\ace\SPIPE_Stream.i"\

+	{$(INCLUDE)}"\ace\Stack.cpp"\

+	{$(INCLUDE)}"\ace\Stack.h"\

+	{$(INCLUDE)}"\ace\Stack.i"\

+	{$(INCLUDE)}"\ace\Stream.cpp"\

+	{$(INCLUDE)}"\ace\Stream.h"\

+	{$(INCLUDE)}"\ace\Stream.i"\

+	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

+	{$(INCLUDE)}"\ace\Stream_Modules.h"\

+	{$(INCLUDE)}"\ace\Stream_Modules.i"\

+	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

+	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

+	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

+	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

+	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

+	{$(INCLUDE)}"\ace\Synch.h"\

+	{$(INCLUDE)}"\ace\Synch.i"\

+	{$(INCLUDE)}"\ace\Synch_Options.h"\

+	{$(INCLUDE)}"\ace\Synch_T.cpp"\

+	{$(INCLUDE)}"\ace\Synch_T.h"\

+	{$(INCLUDE)}"\ace\Synch_T.i"\

+	{$(INCLUDE)}"\ace\Task.cpp"\

+	{$(INCLUDE)}"\ace\Task.h"\

+	{$(INCLUDE)}"\ace\Task.i"\

+	{$(INCLUDE)}"\ace\Thread.h"\

+	{$(INCLUDE)}"\ace\Thread.i"\

+	{$(INCLUDE)}"\ace\Thread_Manager.h"\

+	{$(INCLUDE)}"\ace\Thread_Manager.i"\

+	{$(INCLUDE)}"\ace\Time_Value.h"\

+	{$(INCLUDE)}"\ace\Time_Value.i"\

+	{$(INCLUDE)}"\ace\Timer_Queue.h"\

+	{$(INCLUDE)}"\ace\Timer_Queue.i"\

+	{$(INCLUDE)}"\ace\Token.h"\

+	{$(INCLUDE)}"\ace\Token.i"\

+	{$(INCLUDE)}"\ace\Trace.h"\

+	{$(INCLUDE)}"\ace\UPIPE_Acceptor.h"\

+	{$(INCLUDE)}"\ace\UPIPE_Acceptor.i"\

+	{$(INCLUDE)}"\ace\UPIPE_Addr.h"\

+	{$(INCLUDE)}"\ace\UPIPE_Stream.h"\

+	{$(INCLUDE)}"\ace\UPIPE_Stream.i"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_UPIPE_A=\

+	"c:\ace_wrappers\ace\ace\Sync_T.h"\

+	

+

+"$(INTDIR)\UPIPE_Acceptor.obj" : $(SOURCE) $(DEP_CPP_UPIPE_A) "$(INTDIR)"

+

 

+!ELSEIF  "$(CFG)" == "ace - Win32 Debug"

+

+DEP_CPP_UPIPE_A=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Queue.cpp"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Acceptor.h"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SPIPE_Stream.h"\

+	".\SPIPE_Stream.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\Stream.cpp"\

+	".\Stream.h"\

+	".\Stream.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	".\UPIPE_Acceptor.h"\

+	".\UPIPE_Acceptor.i"\

+	".\UPIPE_Addr.h"\

+	".\UPIPE_Stream.h"\

+	".\UPIPE_Stream.i"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_UPIPE_A=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 SOURCE=.\UPIPE_Acceptor.cpp

 DEP_CPP_UPIPE_A=\

 	{$(INCLUDE)}"\.\UPIPE_Acceptor.h"\

@@ -1044,15 +2326,48 @@ DEP_CPP_UPIPE_A=\
 	{$(INCLUDE)}"\.\SPIPE_Stream.h"\

 	{$(INCLUDE)}"\.\SPIPE_Stream.i"\

 	{$(INCLUDE)}"\.\Thread_Manager.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\UPIPE_Acceptor.obj" : $(SOURCE) $(DEP_CPP_UPIPE_A) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 ################################################################################

 # Begin Source File

 

+<<<<<<< ace.mak
+SOURCE=.\UNIX_Addr.cpp

+DEP_CPP_UNIX_=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	".\UNIX_Addr.h"\

+	".\UNIX_Addr.i"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_UNIX_=\

+	".\..\STL\mutex.h"\

+=======
 SOURCE=.\UNIX_Addr.cpp

 DEP_CPP_UNIX_=\

 	{$(INCLUDE)}"\.\UNIX_Addr.h"\

@@ -1073,6 +2388,7 @@ DEP_CPP_UNIX_=\
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\UNIX_Addr.obj" : $(SOURCE) $(DEP_CPP_UNIX_) "$(INTDIR)"

@@ -1084,6 +2400,31 @@ DEP_CPP_UNIX_=\
 

 SOURCE=.\Trace.cpp

 DEP_CPP_TRACE=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	".\Trace.i"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_TRACE=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\config.h"\

 	{$(INCLUDE)}"\.\ACE.h"\

 	{$(INCLUDE)}"\.\Log_Msg.h"\

@@ -1099,6 +2440,7 @@ DEP_CPP_TRACE=\
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Trace.obj" : $(SOURCE) $(DEP_CPP_TRACE) "$(INTDIR)"

@@ -1110,6 +2452,104 @@ DEP_CPP_TRACE=\
 

 SOURCE=.\Token_Request_Reply.cpp

 DEP_CPP_TOKEN=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Token_Request_Reply.h"\

+	".\Token_Request_Reply.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_TOKEN=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 	{$(INCLUDE)}"\.\Token_Request_Reply.h"\

 	{$(INCLUDE)}"\.\Token_Request_Reply.i"\

 	{$(INCLUDE)}"\.\Local_Tokens.h"\

@@ -1206,6 +2646,7 @@ DEP_CPP_TOKEN=\
 	{$(INCLUDE)}"\.\IPC_SAP.i"\

 	{$(INCLUDE)}"\.\INET_Addr.i"\

 	{$(INCLUDE)}"\.\Time_Value.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Token_Request_Reply.obj" : $(SOURCE) $(DEP_CPP_TOKEN) "$(INTDIR)"

@@ -1217,6 +2658,104 @@ DEP_CPP_TOKEN=\
 

 SOURCE=.\Token_Manager.cpp

 DEP_CPP_TOKEN_=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Token_Manager.h"\

+	".\Token_Manager.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_TOKEN_=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 	{$(INCLUDE)}"\.\Token_Manager.h"\

 	{$(INCLUDE)}"\.\Token_Manager.i"\

 	{$(INCLUDE)}"\.\Synch.h"\

@@ -1313,6 +2852,7 @@ DEP_CPP_TOKEN_=\
 	{$(INCLUDE)}"\.\Local_Tokens.i"\

 	{$(INCLUDE)}"\.\Stack.i"\

 	{$(INCLUDE)}"\.\Stack.cpp"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Token_Manager.obj" : $(SOURCE) $(DEP_CPP_TOKEN_) "$(INTDIR)"

@@ -1324,6 +2864,106 @@ DEP_CPP_TOKEN_=\
 

 SOURCE=.\Token_Collection.cpp

 DEP_CPP_TOKEN_C=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Token_Collection.h"\

+	".\Token_Collection.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_TOKEN_C=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 	{$(INCLUDE)}"\.\Token_Collection.h"\

 	{$(INCLUDE)}"\.\Token_Collection.i"\

 	{$(INCLUDE)}"\.\Map_Manager.h"\

@@ -1422,6 +3062,7 @@ DEP_CPP_TOKEN_C=\
 	{$(INCLUDE)}"\.\Stack.i"\

 	{$(INCLUDE)}"\.\Stack.cpp"\

 	{$(INCLUDE)}"\.\SString.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Token_Collection.obj" : $(SOURCE) $(DEP_CPP_TOKEN_C) "$(INTDIR)"

@@ -1433,6 +3074,45 @@ DEP_CPP_TOKEN_C=\
 

 SOURCE=.\Token.cpp

 DEP_CPP_TOKEN_CP=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_TOKEN_CP=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\Thread.h"\

 	{$(INCLUDE)}"\.\Time_Value.h"\

 	{$(INCLUDE)}"\.\Token.h"\

@@ -1462,6 +3142,7 @@ DEP_CPP_TOKEN_CP=\
 	{$(INCLUDE)}"\.\Synch_T.i"\

 	{$(INCLUDE)}"\.\Synch_T.cpp"\

 	{$(INCLUDE)}"\.\Event_Handler.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Token.obj" : $(SOURCE) $(DEP_CPP_TOKEN_CP) "$(INTDIR)"

@@ -1473,6 +3154,40 @@ DEP_CPP_TOKEN_CP=\
 

 SOURCE=.\TLI_Stream.cpp

 DEP_CPP_TLI_S=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\TLI.h"\

+	".\TLI.i"\

+	".\TLI_Stream.h"\

+	".\TLI_Stream.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_TLI_S=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\TLI_Stream.h"\

 	{$(INCLUDE)}"\.\TLI.h"\

 	{$(INCLUDE)}"\.\INET_Addr.h"\

@@ -1497,6 +3212,7 @@ DEP_CPP_TLI_S=\
 	{$(INCLUDE)}"\.\Log_Record.i"\

 	{$(INCLUDE)}"\.\Addr.i"\

 	{$(INCLUDE)}"\.\INET_Addr.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\TLI_Stream.obj" : $(SOURCE) $(DEP_CPP_TLI_S) "$(INTDIR)"

@@ -1508,6 +3224,44 @@ DEP_CPP_TLI_S=\
 

 SOURCE=.\TLI_Connector.cpp

 DEP_CPP_TLI_C=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\TLI.h"\

+	".\TLI.i"\

+	".\TLI_Connector.h"\

+	".\TLI_Connector.i"\

+	".\TLI_Stream.h"\

+	".\TLI_Stream.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_TLI_C=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\Handle_Set.h"\

 	{$(INCLUDE)}"\.\TLI_Connector.h"\

 	{$(INCLUDE)}"\.\Time_Value.h"\

@@ -1536,6 +3290,7 @@ DEP_CPP_TLI_C=\
 	{$(INCLUDE)}"\.\Addr.i"\

 	{$(INCLUDE)}"\.\INET_Addr.i"\

 	{$(INCLUDE)}"\.\Time_Value.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\TLI_Connector.obj" : $(SOURCE) $(DEP_CPP_TLI_C) "$(INTDIR)"

@@ -1547,6 +3302,42 @@ DEP_CPP_TLI_C=\
 

 SOURCE=.\TLI_Acceptor.cpp

 DEP_CPP_TLI_A=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\TLI.h"\

+	".\TLI.i"\

+	".\TLI_Acceptor.h"\

+	".\TLI_Acceptor.i"\

+	".\TLI_Stream.h"\

+	".\TLI_Stream.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_TLI_A=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\TLI_Acceptor.h"\

 	{$(INCLUDE)}"\.\TLI.h"\

 	{$(INCLUDE)}"\.\Time_Value.h"\

@@ -1573,6 +3364,7 @@ DEP_CPP_TLI_A=\
 	{$(INCLUDE)}"\.\INET_Addr.h"\

 	{$(INCLUDE)}"\.\TLI_Stream.i"\

 	{$(INCLUDE)}"\.\INET_Addr.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\TLI_Acceptor.obj" : $(SOURCE) $(DEP_CPP_TLI_A) "$(INTDIR)"

@@ -1584,6 +3376,36 @@ DEP_CPP_TLI_A=\
 

 SOURCE=.\TLI.cpp

 DEP_CPP_TLI_CP=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\TLI.h"\

+	".\TLI.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_TLI_CP=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\TLI.h"\

 	{$(INCLUDE)}"\.\IPC_SAP.h"\

 	{$(INCLUDE)}"\.\Addr.h"\

@@ -1604,6 +3426,7 @@ DEP_CPP_TLI_CP=\
 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

 	{$(INCLUDE)}"\.\Addr.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\TLI.obj" : $(SOURCE) $(DEP_CPP_TLI_CP) "$(INTDIR)"

@@ -1615,6 +3438,45 @@ DEP_CPP_TLI_CP=\
 

 SOURCE=.\Timer_Queue.cpp

 DEP_CPP_TIMER=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_TIMER=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\Timer_Queue.h"\

 	{$(INCLUDE)}"\.\Event_Handler.h"\

 	{$(INCLUDE)}"\.\Time_Value.h"\

@@ -1644,6 +3506,7 @@ DEP_CPP_TIMER=\
 	{$(INCLUDE)}"\.\Synch_T.cpp"\

 	{$(INCLUDE)}"\.\Thread.h"\

 	{$(INCLUDE)}"\.\Thread.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Timer_Queue.obj" : $(SOURCE) $(DEP_CPP_TIMER) "$(INTDIR)"

@@ -1655,6 +3518,30 @@ DEP_CPP_TIMER=\
 

 SOURCE=.\Time_Value.cpp

 DEP_CPP_TIME_=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_TIME_=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\ACE.h"\

 	{$(INCLUDE)}"\.\Time_Value.h"\

 	{$(INCLUDE)}"\.\Time_Value.i"\

@@ -1669,6 +3556,7 @@ DEP_CPP_TIME_=\
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Time_Value.obj" : $(SOURCE) $(DEP_CPP_TIME_) "$(INTDIR)"

@@ -1680,6 +3568,33 @@ DEP_CPP_TIME_=\
 

 SOURCE=.\Time_Request_Reply.cpp

 DEP_CPP_TIME_R=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Time_Request_Reply.h"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_TIME_R=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\Time_Request_Reply.h"\

 	{$(INCLUDE)}"\.\Time_Value.h"\

 	{$(INCLUDE)}"\.\SString.h"\

@@ -1697,6 +3612,7 @@ DEP_CPP_TIME_R=\
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Time_Request_Reply.obj" : $(SOURCE) $(DEP_CPP_TIME_R) "$(INTDIR)"

@@ -1708,6 +3624,45 @@ DEP_CPP_TIME_R=\
 

 SOURCE=.\Thread_Manager.cpp

 DEP_CPP_THREA=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_THREA=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\Thread_Manager.h"\

 	{$(INCLUDE)}"\.\Thread_Manager.i"\

 	{$(INCLUDE)}"\.\Thread.h"\

@@ -1737,6 +3692,7 @@ DEP_CPP_THREA=\
 	{$(INCLUDE)}"\.\Synch_T.i"\

 	{$(INCLUDE)}"\.\Synch_T.cpp"\

 	{$(INCLUDE)}"\.\Event_Handler.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Thread_Manager.obj" : $(SOURCE) $(DEP_CPP_THREA) "$(INTDIR)"

@@ -1748,6 +3704,32 @@ DEP_CPP_THREA=\
 

 SOURCE=.\Thread.cpp

 DEP_CPP_THREAD=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_THREAD=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\Thread.h"\

 	{$(INCLUDE)}"\.\Thread.i"\

 	{$(INCLUDE)}"\.\ACE.h"\

@@ -1764,6 +3746,7 @@ DEP_CPP_THREAD=\
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Thread.obj" : $(SOURCE) $(DEP_CPP_THREAD) "$(INTDIR)"

@@ -1775,6 +3758,57 @@ DEP_CPP_THREAD=\
 

 SOURCE=.\System_Time.cpp

 DEP_CPP_SYSTE=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Signal.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\System_Time.h"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SYSTE=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 	{$(INCLUDE)}"\.\Time_Value.h"\

 	{$(INCLUDE)}"\.\System_Time.h"\

 	{$(INCLUDE)}"\.\config.h"\

@@ -1817,6 +3851,7 @@ DEP_CPP_SYSTE=\
 	{$(INCLUDE)}"\.\Set.i"\

 	{$(INCLUDE)}"\.\Set.cpp"\

 	{$(INCLUDE)}"\.\Mem_Map.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\System_Time.obj" : $(SOURCE) $(DEP_CPP_SYSTE) "$(INTDIR)"

@@ -1828,6 +3863,31 @@ DEP_CPP_SYSTE=\
 

 SOURCE=.\Synch_Options.cpp

 DEP_CPP_SYNCH=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Synch_Options.h"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SYNCH=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\Synch_Options.h"\

 	{$(INCLUDE)}"\.\ACE.h"\

 	{$(INCLUDE)}"\.\OS.h"\

@@ -1843,6 +3903,7 @@ DEP_CPP_SYNCH=\
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Synch_Options.obj" : $(SOURCE) $(DEP_CPP_SYNCH) "$(INTDIR)"

@@ -1854,6 +3915,43 @@ DEP_CPP_SYNCH=\
 

 SOURCE=.\Synch.cpp

 DEP_CPP_SYNCH_=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SYNCH_=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\Thread.h"\

 	{$(INCLUDE)}"\.\Synch.h"\

 	{$(INCLUDE)}"\.\Time_Value.h"\

@@ -1881,6 +3979,7 @@ DEP_CPP_SYNCH_=\
 	{$(INCLUDE)}"\.\Synch_T.cpp"\

 	{$(INCLUDE)}"\.\Event_Handler.i"\

 	{$(INCLUDE)}"\.\Time_Value.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Synch.obj" : $(SOURCE) $(DEP_CPP_SYNCH_) "$(INTDIR)"

@@ -1890,6 +3989,253 @@ DEP_CPP_SYNCH_=\
 ################################################################################

 # Begin Source File

 

+<<<<<<< ace.mak
+SOURCE=.\Svc_Conf_y.cpp

+

+!IF  "$(CFG)" == "ace - Win32 Release"

+

+DEP_CPP_SVC_C=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\ARGV.h"\

+	".\ARGV.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Queue.cpp"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Module.h"\

+	".\Obstack.h"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Parse_Node.h"\

+	".\Parse_Node.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Record.h"\

+	".\Service_Record.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\Stream.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf.h"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SVC_C=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+	

+

+"$(INTDIR)\Svc_Conf_y.obj" : $(SOURCE) $(DEP_CPP_SVC_C) "$(INTDIR)"

+

+

+!ELSEIF  "$(CFG)" == "ace - Win32 Debug"

+

+DEP_CPP_SVC_C=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\ARGV.h"\

+	".\ARGV.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Queue.cpp"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Obstack.h"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Parse_Node.h"\

+	".\Parse_Node.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Record.h"\

+	".\Service_Record.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\Stream.cpp"\

+	".\Stream.h"\

+	".\Stream.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf.h"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SVC_C=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 SOURCE=.\Svc_Conf_y.cpp

 DEP_CPP_SVC_C=\

 	{$(INCLUDE)}"\.\ARGV.h"\

@@ -2008,15 +4354,135 @@ DEP_CPP_SVC_C=\
 	{$(INCLUDE)}"\.\Stream_Modules.cpp"\

 	{$(INCLUDE)}"\.\Stream.i"\

 	{$(INCLUDE)}"\.\Stream.cpp"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Svc_Conf_y.obj" : $(SOURCE) $(DEP_CPP_SVC_C) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 ################################################################################

 # Begin Source File

 

+<<<<<<< ace.mak
+SOURCE=.\Svc_Conf_l.cpp

+

+!IF  "$(CFG)" == "ace - Win32 Release"

+

+DEP_CPP_SVC_CO=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Queue.cpp"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Module.h"\

+	".\Obstack.h"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Parse_Node.h"\

+	".\Parse_Node.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Record.h"\

+	".\Service_Record.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\Stream.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf.h"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SVC_CO=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 SOURCE=.\Svc_Conf_l.cpp

 DEP_CPP_SVC_CO=\

 	{$(INCLUDE)}"\.\config.h"\

@@ -2133,15 +4599,172 @@ DEP_CPP_SVC_CO=\
 	{$(INCLUDE)}"\.\Stream_Modules.h"\

 	{$(INCLUDE)}"\.\Stream_Modules.i"\

 	{$(INCLUDE)}"\.\Stream_Modules.cpp"\

+>>>>>>> 4.8
+	

+

+"$(INTDIR)\Svc_Conf_l.obj" : $(SOURCE) $(DEP_CPP_SVC_CO) "$(INTDIR)"

+

+

+!ELSEIF  "$(CFG)" == "ace - Win32 Debug"

+

+DEP_CPP_SVC_CO=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Queue.cpp"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Obstack.h"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Parse_Node.h"\

+	".\Parse_Node.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Record.h"\

+	".\Service_Record.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\Stream.cpp"\

+	".\Stream.h"\

+	".\Stream.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf.h"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SVC_CO=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

 	

 

 "$(INTDIR)\Svc_Conf_l.obj" : $(SOURCE) $(DEP_CPP_SVC_CO) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 ################################################################################

 # Begin Source File

 

+<<<<<<< ace.mak
+SOURCE=.\SV_Shared_Memory.cpp

+DEP_CPP_SV_SH=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SV_Shared_Memory.h"\

+	".\SV_Shared_Memory.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SV_SH=\

+	".\..\STL\mutex.h"\

+=======
 SOURCE=.\SV_Shared_Memory.cpp

 DEP_CPP_SV_SH=\

 	{$(INCLUDE)}"\.\SV_Shared_Memory.h"\

@@ -2160,6 +4783,7 @@ DEP_CPP_SV_SH=\
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\SV_Shared_Memory.obj" : $(SOURCE) $(DEP_CPP_SV_SH) "$(INTDIR)"

@@ -2169,6 +4793,34 @@ DEP_CPP_SV_SH=\
 ################################################################################

 # Begin Source File

 

+<<<<<<< ace.mak
+SOURCE=.\SV_Semaphore_Simple.cpp

+DEP_CPP_SV_SE=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SV_SE=\

+	".\..\STL\mutex.h"\

+=======
 SOURCE=.\SV_Semaphore_Simple.cpp

 DEP_CPP_SV_SE=\

 	{$(INCLUDE)}"\.\SV_Semaphore_Simple.h"\

@@ -2187,6 +4839,7 @@ DEP_CPP_SV_SE=\
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\SV_Semaphore_Simple.obj" : $(SOURCE) $(DEP_CPP_SV_SE) "$(INTDIR)"

@@ -2196,6 +4849,36 @@ DEP_CPP_SV_SE=\
 ################################################################################

 # Begin Source File

 

+<<<<<<< ace.mak
+SOURCE=.\SV_Semaphore_Complex.cpp

+DEP_CPP_SV_SEM=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SV_SEM=\

+	".\..\STL\mutex.h"\

+=======
 SOURCE=.\SV_Semaphore_Complex.cpp

 DEP_CPP_SV_SEM=\

 	{$(INCLUDE)}"\.\SV_Semaphore_Complex.h"\

@@ -2216,6 +4899,7 @@ DEP_CPP_SV_SEM=\
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\SV_Semaphore_Complex.obj" : $(SOURCE) $(DEP_CPP_SV_SEM) "$(INTDIR)"

@@ -2225,6 +4909,36 @@ DEP_CPP_SV_SEM=\
 ################################################################################

 # Begin Source File

 

+<<<<<<< ace.mak
+SOURCE=.\SV_Message_Queue.cpp

+DEP_CPP_SV_ME=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SV_Message.h"\

+	".\SV_Message.i"\

+	".\SV_Message_Queue.h"\

+	".\SV_Message_Queue.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SV_ME=\

+	".\..\STL\mutex.h"\

+=======
 SOURCE=.\SV_Message_Queue.cpp

 DEP_CPP_SV_ME=\

 	{$(INCLUDE)}"\.\SV_Message_Queue.h"\

@@ -2245,6 +4959,7 @@ DEP_CPP_SV_ME=\
 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

 	{$(INCLUDE)}"\.\SV_Message.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\SV_Message_Queue.obj" : $(SOURCE) $(DEP_CPP_SV_ME) "$(INTDIR)"

@@ -2254,6 +4969,34 @@ DEP_CPP_SV_ME=\
 ################################################################################

 # Begin Source File

 

+<<<<<<< ace.mak
+SOURCE=.\SV_Message.cpp

+DEP_CPP_SV_MES=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SV_Message.h"\

+	".\SV_Message.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SV_MES=\

+	".\..\STL\mutex.h"\

+=======
 SOURCE=.\SV_Message.cpp

 DEP_CPP_SV_MES=\

 	{$(INCLUDE)}"\.\SV_Message.h"\

@@ -2272,6 +5015,7 @@ DEP_CPP_SV_MES=\
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\SV_Message.obj" : $(SOURCE) $(DEP_CPP_SV_MES) "$(INTDIR)"

@@ -2281,6 +5025,106 @@ DEP_CPP_SV_MES=\
 ################################################################################

 # Begin Source File

 

+<<<<<<< ace.mak
+SOURCE=.\SString.cpp

+DEP_CPP_SSTRI=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SSTRI=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 SOURCE=.\SString.cpp

 DEP_CPP_SSTRI=\

 	{$(INCLUDE)}"\.\Malloc.h"\

@@ -2379,6 +5223,7 @@ DEP_CPP_SSTRI=\
 	{$(INCLUDE)}"\.\Addr.i"\

 	{$(INCLUDE)}"\.\IPC_SAP.i"\

 	{$(INCLUDE)}"\.\INET_Addr.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\SString.obj" : $(SOURCE) $(DEP_CPP_SSTRI) "$(INTDIR)"

@@ -2388,6 +5233,42 @@ DEP_CPP_SSTRI=\
 ################################################################################

 # Begin Source File

 

+<<<<<<< ace.mak
+SOURCE=.\SPIPE_Stream.cpp

+DEP_CPP_SPIPE=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SPIPE_Stream.h"\

+	".\SPIPE_Stream.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SPIPE=\

+	".\..\STL\mutex.h"\

+=======
 SOURCE=.\SPIPE_Stream.cpp

 DEP_CPP_SPIPE=\

 	{$(INCLUDE)}"\.\SPIPE_Stream.h"\

@@ -2414,6 +5295,7 @@ DEP_CPP_SPIPE=\
 	{$(INCLUDE)}"\.\Addr.h"\

 	{$(INCLUDE)}"\.\SPIPE_Addr.i"\

 	{$(INCLUDE)}"\.\Addr.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\SPIPE_Stream.obj" : $(SOURCE) $(DEP_CPP_SPIPE) "$(INTDIR)"

@@ -2423,6 +5305,44 @@ DEP_CPP_SPIPE=\
 ################################################################################

 # Begin Source File

 

+<<<<<<< ace.mak
+SOURCE=.\SPIPE_Connector.cpp

+DEP_CPP_SPIPE_=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SPIPE_Connector.h"\

+	".\SPIPE_Connector.i"\

+	".\SPIPE_Stream.h"\

+	".\SPIPE_Stream.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SPIPE_=\

+	".\..\STL\mutex.h"\

+=======
 SOURCE=.\SPIPE_Connector.cpp

 DEP_CPP_SPIPE_=\

 	{$(INCLUDE)}"\.\SPIPE_Connector.h"\

@@ -2451,6 +5371,7 @@ DEP_CPP_SPIPE_=\
 	{$(INCLUDE)}"\.\Addr.h"\

 	{$(INCLUDE)}"\.\SPIPE_Addr.i"\

 	{$(INCLUDE)}"\.\Addr.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\SPIPE_Connector.obj" : $(SOURCE) $(DEP_CPP_SPIPE_) "$(INTDIR)"

@@ -2460,6 +5381,36 @@ DEP_CPP_SPIPE_=\
 ################################################################################

 # Begin Source File

 

+<<<<<<< ace.mak
+SOURCE=.\SPIPE_Addr.cpp

+DEP_CPP_SPIPE_A=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SPIPE_A=\

+	".\..\STL\mutex.h"\

+=======
 SOURCE=.\SPIPE_Addr.cpp

 DEP_CPP_SPIPE_A=\

 	{$(INCLUDE)}"\.\SPIPE_Addr.h"\

@@ -2480,6 +5431,7 @@ DEP_CPP_SPIPE_A=\
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\SPIPE_Addr.obj" : $(SOURCE) $(DEP_CPP_SPIPE_A) "$(INTDIR)"

@@ -2489,6 +5441,43 @@ DEP_CPP_SPIPE_A=\
 ################################################################################

 # Begin Source File

 

+<<<<<<< ace.mak
+SOURCE=.\SPIPE_Acceptor.cpp

+DEP_CPP_SPIPE_AC=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Acceptor.h"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SPIPE_Stream.h"\

+	".\SPIPE_Stream.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SPIPE_AC=\

+	".\..\STL\mutex.h"\

+=======
 SOURCE=.\SPIPE_Acceptor.cpp

 DEP_CPP_SPIPE_AC=\

 	{$(INCLUDE)}"\.\SPIPE_Acceptor.h"\

@@ -2516,6 +5505,7 @@ DEP_CPP_SPIPE_AC=\
 	{$(INCLUDE)}"\.\Addr.h"\

 	{$(INCLUDE)}"\.\SPIPE_Addr.i"\

 	{$(INCLUDE)}"\.\Addr.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\SPIPE_Acceptor.obj" : $(SOURCE) $(DEP_CPP_SPIPE_AC) "$(INTDIR)"

@@ -2525,6 +5515,40 @@ DEP_CPP_SPIPE_AC=\
 ################################################################################

 # Begin Source File

 

+<<<<<<< ace.mak
+SOURCE=.\SPIPE.cpp

+DEP_CPP_SPIPE_C=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SPIPE_C=\

+	".\..\STL\mutex.h"\

+=======
 SOURCE=.\SPIPE.cpp

 DEP_CPP_SPIPE_C=\

 	{$(INCLUDE)}"\.\SPIPE.h"\

@@ -2549,6 +5573,7 @@ DEP_CPP_SPIPE_C=\
 	{$(INCLUDE)}"\.\Addr.h"\

 	{$(INCLUDE)}"\.\SPIPE_Addr.i"\

 	{$(INCLUDE)}"\.\Addr.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\SPIPE.obj" : $(SOURCE) $(DEP_CPP_SPIPE_C) "$(INTDIR)"

@@ -2558,6 +5583,44 @@ DEP_CPP_SPIPE_C=\
 ################################################################################

 # Begin Source File

 

+<<<<<<< ace.mak
+SOURCE=.\SOCK_Stream.cpp

+DEP_CPP_SOCK_=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SOCK_=\

+	".\..\STL\mutex.h"\

+=======
 SOURCE=.\SOCK_Stream.cpp

 DEP_CPP_SOCK_=\

 	{$(INCLUDE)}"\.\SOCK_Stream.h"\

@@ -2586,6 +5649,7 @@ DEP_CPP_SOCK_=\
 	{$(INCLUDE)}"\.\Addr.i"\

 	{$(INCLUDE)}"\.\IPC_SAP.i"\

 	{$(INCLUDE)}"\.\INET_Addr.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\SOCK_Stream.obj" : $(SOURCE) $(DEP_CPP_SOCK_) "$(INTDIR)"

@@ -2595,6 +5659,40 @@ DEP_CPP_SOCK_=\
 ################################################################################

 # Begin Source File

 

+<<<<<<< ace.mak
+SOURCE=.\SOCK_IO.cpp

+DEP_CPP_SOCK_I=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SOCK_I=\

+	".\..\STL\mutex.h"\

+=======
 SOURCE=.\SOCK_IO.cpp

 DEP_CPP_SOCK_I=\

 	{$(INCLUDE)}"\.\SOCK_IO.h"\

@@ -2619,6 +5717,7 @@ DEP_CPP_SOCK_I=\
 	{$(INCLUDE)}"\.\Log_Record.i"\

 	{$(INCLUDE)}"\.\Addr.i"\

 	{$(INCLUDE)}"\.\IPC_SAP.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\SOCK_IO.obj" : $(SOURCE) $(DEP_CPP_SOCK_I) "$(INTDIR)"

@@ -2628,6 +5727,44 @@ DEP_CPP_SOCK_I=\
 ################################################################################

 # Begin Source File

 

+<<<<<<< ace.mak
+SOURCE=.\SOCK_Dgram_Mcast.cpp

+DEP_CPP_SOCK_D=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Dgram.h"\

+	".\SOCK_Dgram.i"\

+	".\SOCK_Dgram_Mcast.h"\

+	".\SOCK_Dgram_Mcast.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SOCK_D=\

+	".\..\STL\mutex.h"\

+=======
 SOURCE=.\SOCK_Dgram_Mcast.cpp

 DEP_CPP_SOCK_D=\

 	{$(INCLUDE)}"\.\SOCK_Dgram_Mcast.h"\

@@ -2656,6 +5793,7 @@ DEP_CPP_SOCK_D=\
 	{$(INCLUDE)}"\.\IPC_SAP.i"\

 	{$(INCLUDE)}"\.\Addr.i"\

 	{$(INCLUDE)}"\.\INET_Addr.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\SOCK_Dgram_Mcast.obj" : $(SOURCE) $(DEP_CPP_SOCK_D) "$(INTDIR)"

@@ -2665,6 +5803,44 @@ DEP_CPP_SOCK_D=\
 ################################################################################

 # Begin Source File

 

+<<<<<<< ace.mak
+SOURCE=.\SOCK_Dgram_Bcast.cpp

+DEP_CPP_SOCK_DG=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Dgram.h"\

+	".\SOCK_Dgram.i"\

+	".\SOCK_Dgram_Bcast.h"\

+	".\SOCK_Dgram_Bcast.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SOCK_DG=\

+	".\..\STL\mutex.h"\

+=======
 SOURCE=.\SOCK_Dgram_Bcast.cpp

 DEP_CPP_SOCK_DG=\

 	{$(INCLUDE)}"\.\SOCK_Dgram_Bcast.h"\

@@ -2693,6 +5869,7 @@ DEP_CPP_SOCK_DG=\
 	{$(INCLUDE)}"\.\IPC_SAP.h"\

 	{$(INCLUDE)}"\.\SOCK.i"\

 	{$(INCLUDE)}"\.\IPC_SAP.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\SOCK_Dgram_Bcast.obj" : $(SOURCE) $(DEP_CPP_SOCK_DG) "$(INTDIR)"

@@ -2702,6 +5879,40 @@ DEP_CPP_SOCK_DG=\
 ################################################################################

 # Begin Source File

 

+<<<<<<< ace.mak
+SOURCE=.\SOCK_Dgram.cpp

+DEP_CPP_SOCK_DGR=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Dgram.h"\

+	".\SOCK_Dgram.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SOCK_DGR=\

+	".\..\STL\mutex.h"\

+=======
 SOURCE=.\SOCK_Dgram.cpp

 DEP_CPP_SOCK_DGR=\

 	{$(INCLUDE)}"\.\SOCK_Dgram.h"\

@@ -2726,6 +5937,7 @@ DEP_CPP_SOCK_DGR=\
 	{$(INCLUDE)}"\.\Log_Record.i"\

 	{$(INCLUDE)}"\.\IPC_SAP.i"\

 	{$(INCLUDE)}"\.\Addr.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\SOCK_Dgram.obj" : $(SOURCE) $(DEP_CPP_SOCK_DGR) "$(INTDIR)"

@@ -2735,6 +5947,48 @@ DEP_CPP_SOCK_DGR=\
 ################################################################################

 # Begin Source File

 

+<<<<<<< ace.mak
+SOURCE=.\SOCK_Connector.cpp

+DEP_CPP_SOCK_C=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SOCK_C=\

+	".\..\STL\mutex.h"\

+=======
 SOURCE=.\SOCK_Connector.cpp

 DEP_CPP_SOCK_C=\

 	{$(INCLUDE)}"\.\SOCK_Connector.h"\

@@ -2767,7 +6021,49 @@ DEP_CPP_SOCK_C=\
 	{$(INCLUDE)}"\.\Time_Value.i"\

 	{$(INCLUDE)}"\.\Handle_Set.i"\

 	{$(INCLUDE)}"\.\INET_Addr.i"\

+>>>>>>> 4.8
 	

+<<<<<<< ace.mak
+

+"$(INTDIR)\SOCK_Connector.obj" : $(SOURCE) $(DEP_CPP_SOCK_C) "$(INTDIR)"

+

+

+# End Source File

+################################################################################

+# Begin Source File

+

+SOURCE=.\SOCK_CODgram.cpp

+DEP_CPP_SOCK_CO=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_CODgram.h"\

+	".\SOCK_CODgram.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+=======
 

 "$(INTDIR)\SOCK_Connector.obj" : $(SOURCE) $(DEP_CPP_SOCK_C) "$(INTDIR)"

 

@@ -2782,11 +6078,63 @@ SOURCE=.\SOCK_CODgram.cpp
 

 DEP_CPP_SOCK_CO=\

 	{$(INCLUDE)}"\.\SOCK_CODgram.h"\

+>>>>>>> 4.8
+	

+<<<<<<< ace.mak
+NODEP_CPP_SOCK_CO=\

+	".\..\STL\mutex.h"\

 	

 

 "$(INTDIR)\SOCK_CODgram.obj" : $(SOURCE) $(DEP_CPP_SOCK_CO) "$(INTDIR)"

 

 

+# End Source File

+################################################################################

+# Begin Source File

+

+SOURCE=.\SOCK_Acceptor.cpp

+DEP_CPP_SOCK_A=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SOCK_A=\

+	".\..\STL\mutex.h"\

+=======
+

+"$(INTDIR)\SOCK_CODgram.obj" : $(SOURCE) $(DEP_CPP_SOCK_CO) "$(INTDIR)"

+

+

 !ELSEIF  "$(CFG)" == "ace - Win32 Debug"

 

 DEP_CPP_SOCK_CO=\

@@ -2855,6 +6203,7 @@ DEP_CPP_SOCK_A=\
 	{$(INCLUDE)}"\.\IPC_SAP.i"\

 	{$(INCLUDE)}"\.\INET_Addr.i"\

 	{$(INCLUDE)}"\.\Time_Value.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\SOCK_Acceptor.obj" : $(SOURCE) $(DEP_CPP_SOCK_A) "$(INTDIR)"

@@ -2864,6 +6213,49 @@ DEP_CPP_SOCK_A=\
 ################################################################################

 # Begin Source File

 

+<<<<<<< ace.mak
+SOURCE=.\Signal.cpp

+DEP_CPP_SIGNA=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Signal.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SIGNA=\

+	".\..\STL\mutex.h"\

+=======
 SOURCE=.\Signal.cpp

 DEP_CPP_SIGNA=\

 	{$(INCLUDE)}"\.\Signal.h"\

@@ -2898,7 +6290,44 @@ DEP_CPP_SIGNA=\
 	{$(INCLUDE)}"\.\Event_Handler.i"\

 	{$(INCLUDE)}"\.\Set.i"\

 	{$(INCLUDE)}"\.\Set.cpp"\

+>>>>>>> 4.8
+	

+<<<<<<< ace.mak
+

+"$(INTDIR)\Signal.obj" : $(SOURCE) $(DEP_CPP_SIGNA) "$(INTDIR)"

+

+

+# End Source File

+################################################################################

+# Begin Source File

+

+SOURCE=.\Shared_Object.cpp

+DEP_CPP_SHARE=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

 	

+NODEP_CPP_SHARE=\

+	".\..\STL\mutex.h"\

+=======
 

 "$(INTDIR)\Signal.obj" : $(SOURCE) $(DEP_CPP_SIGNA) "$(INTDIR)"

 

@@ -2925,6 +6354,7 @@ DEP_CPP_SHARE=\
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Shared_Object.obj" : $(SOURCE) $(DEP_CPP_SHARE) "$(INTDIR)"

@@ -2934,6 +6364,283 @@ DEP_CPP_SHARE=\
 ################################################################################

 # Begin Source File

 

+<<<<<<< ace.mak
+SOURCE=.\Shared_Memory_SV.cpp

+DEP_CPP_SHARED=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Shared_Memory.h"\

+	".\Shared_Memory_SV.h"\

+	".\Shared_Memory_SV.i"\

+	".\SV_Shared_Memory.h"\

+	".\SV_Shared_Memory.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SHARED=\

+	".\..\STL\mutex.h"\

+	

+

+"$(INTDIR)\Shared_Memory_SV.obj" : $(SOURCE) $(DEP_CPP_SHARED) "$(INTDIR)"

+

+

+# End Source File

+################################################################################

+# Begin Source File

+

+SOURCE=.\Shared_Memory_MM.cpp

+DEP_CPP_SHARED_=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Shared_Memory.h"\

+	".\Shared_Memory_MM.h"\

+	".\Shared_Memory_MM.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SHARED_=\

+	".\..\STL\mutex.h"\

+	

+

+"$(INTDIR)\Shared_Memory_MM.obj" : $(SOURCE) $(DEP_CPP_SHARED_) "$(INTDIR)"

+

+

+# End Source File

+################################################################################

+# Begin Source File

+

+SOURCE=.\Service_Repository.cpp

+

+!IF  "$(CFG)" == "ace - Win32 Release"

+

+DEP_CPP_SERVI=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\IO_Cntl_Msg.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Queue.cpp"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Module.h"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Record.h"\

+	".\Service_Record.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\Stream.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SERVI=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+	

+

+"$(INTDIR)\Service_Repository.obj" : $(SOURCE) $(DEP_CPP_SERVI) "$(INTDIR)"

+

+

+!ELSEIF  "$(CFG)" == "ace - Win32 Debug"

+

+DEP_CPP_SERVI=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Queue.cpp"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Record.h"\

+	".\Service_Record.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\Stream.cpp"\

+	".\Stream.h"\

+	".\Stream.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SERVI=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 SOURCE=.\Shared_Memory_SV.cpp

 DEP_CPP_SHARED=\

 	{$(INCLUDE)}"\.\Shared_Memory_SV.h"\

@@ -3108,15 +6815,93 @@ DEP_CPP_SERVI=\
 	{$(INCLUDE)}"\.\Stream_Modules.h"\

 	{$(INCLUDE)}"\.\Stream_Modules.i"\

 	{$(INCLUDE)}"\.\Stream_Modules.cpp"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Service_Repository.obj" : $(SOURCE) $(DEP_CPP_SERVI) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 ################################################################################

 # Begin Source File

 

+<<<<<<< ace.mak
+SOURCE=.\Service_Record.cpp

+

+!IF  "$(CFG)" == "ace - Win32 Release"

+

+DEP_CPP_SERVIC=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\IO_Cntl_Msg.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Queue.cpp"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Module.h"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Record.h"\

+	".\Service_Record.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\Stream.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SERVIC=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 SOURCE=.\Service_Record.cpp

 DEP_CPP_SERVIC=\

 	{$(INCLUDE)}"\.\Service_Record.h"\

@@ -3229,7 +7014,172 @@ DEP_CPP_SERVIC=\
 	{$(INCLUDE)}"\.\Stream_Modules.h"\

 	{$(INCLUDE)}"\.\Stream_Modules.i"\

 	{$(INCLUDE)}"\.\Stream_Modules.cpp"\

+>>>>>>> 4.8
+	

+<<<<<<< ace.mak
+

+"$(INTDIR)\Service_Record.obj" : $(SOURCE) $(DEP_CPP_SERVIC) "$(INTDIR)"

+

+

+!ELSEIF  "$(CFG)" == "ace - Win32 Debug"

+

+DEP_CPP_SERVIC=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Queue.cpp"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Record.h"\

+	".\Service_Record.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\Stream.cpp"\

+	".\Stream.h"\

+	".\Stream.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SERVIC=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+	

+

+"$(INTDIR)\Service_Record.obj" : $(SOURCE) $(DEP_CPP_SERVIC) "$(INTDIR)"

+

+

+!ENDIF 

+

+# End Source File

+################################################################################

+# Begin Source File

+

+SOURCE=.\Service_Object.cpp

+DEP_CPP_SERVICE=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

 	

+NODEP_CPP_SERVICE=\

+	".\..\STL\mutex.h"\

+=======
 

 "$(INTDIR)\Service_Record.obj" : $(SOURCE) $(DEP_CPP_SERVIC) "$(INTDIR)"

 

@@ -3260,6 +7210,7 @@ DEP_CPP_SERVICE=\
 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

 	{$(INCLUDE)}"\.\Event_Handler.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Service_Object.obj" : $(SOURCE) $(DEP_CPP_SERVICE) "$(INTDIR)"

@@ -3269,8 +7220,131 @@ DEP_CPP_SERVICE=\
 ################################################################################

 # Begin Source File

 

+<<<<<<< ace.mak
 SOURCE=.\Service_Manager.cpp

+

+!IF  "$(CFG)" == "ace - Win32 Release"

+

+=======
+SOURCE=.\Service_Manager.cpp

+>>>>>>> 4.8
 DEP_CPP_SERVICE_=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Get_Opt.h"\

+	".\Get_Opt.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Queue.cpp"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Module.h"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Manager.h"\

+	".\Service_Manager.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Record.h"\

+	".\Service_Record.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\Stream.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SERVICE_=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 	{$(INCLUDE)}"\.\Get_Opt.h"\

 	{$(INCLUDE)}"\.\Service_Repository.h"\

 	{$(INCLUDE)}"\.\Service_Config.h"\

@@ -3389,17 +7463,249 @@ DEP_CPP_SERVICE_=\
 	{$(INCLUDE)}"\.\Reactor.i"\

 	{$(INCLUDE)}"\.\Handle_Set.i"\

 	{$(INCLUDE)}"\.\Pipe.i"\

+>>>>>>> 4.8
+	

+

+"$(INTDIR)\Service_Manager.obj" : $(SOURCE) $(DEP_CPP_SERVICE_) "$(INTDIR)"

+

+

+<<<<<<< ace.mak
+!ELSEIF  "$(CFG)" == "ace - Win32 Debug"

+

+DEP_CPP_SERVICE_=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Get_Opt.h"\

+	".\Get_Opt.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Queue.cpp"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Manager.h"\

+	".\Service_Manager.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Record.h"\

+	".\Service_Record.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\Stream.cpp"\

+	".\Stream.h"\

+	".\Stream.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SERVICE_=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

 	

 

 "$(INTDIR)\Service_Manager.obj" : $(SOURCE) $(DEP_CPP_SERVICE_) "$(INTDIR)"

 

 

+!ENDIF 

+

+=======
+>>>>>>> 4.8
 # End Source File

 ################################################################################

 # Begin Source File

 

 SOURCE=.\Service_Main.cpp

 DEP_CPP_SERVICE_M=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SERVICE_M=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 	{$(INCLUDE)}"\.\Service_Config.h"\

 	{$(INCLUDE)}"\.\Service_Object.h"\

 	{$(INCLUDE)}"\.\Thread_Manager.h"\

@@ -3494,6 +7800,7 @@ DEP_CPP_SERVICE_M=\
 	{$(INCLUDE)}"\.\Addr.i"\

 	{$(INCLUDE)}"\.\IPC_SAP.i"\

 	{$(INCLUDE)}"\.\INET_Addr.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Service_Main.obj" : $(SOURCE) $(DEP_CPP_SERVICE_M) "$(INTDIR)"

@@ -3503,6 +7810,275 @@ DEP_CPP_SERVICE_M=\
 ################################################################################

 # Begin Source File

 

+<<<<<<< ace.mak
+SOURCE=.\Service_Config.cpp

+

+!IF  "$(CFG)" == "ace - Win32 Release"

+

+DEP_CPP_SERVICE_C=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\ARGV.h"\

+	".\ARGV.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Get_Opt.h"\

+	".\Get_Opt.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Queue.cpp"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Module.h"\

+	".\Obstack.h"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Parse_Node.h"\

+	".\Parse_Node.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Manager.h"\

+	".\Service_Manager.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Record.h"\

+	".\Service_Record.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\Stream.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf.h"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SERVICE_C=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+	

+

+"$(INTDIR)\Service_Config.obj" : $(SOURCE) $(DEP_CPP_SERVICE_C) "$(INTDIR)"

+

+

+!ELSEIF  "$(CFG)" == "ace - Win32 Debug"

+

+DEP_CPP_SERVICE_C=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\ARGV.h"\

+	".\ARGV.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Get_Opt.h"\

+	".\Get_Opt.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Queue.cpp"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Obstack.h"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Parse_Node.h"\

+	".\Parse_Node.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Manager.h"\

+	".\Service_Manager.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Record.h"\

+	".\Service_Record.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\Stream.cpp"\

+	".\Stream.h"\

+	".\Stream.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf.h"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SERVICE_C=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 SOURCE=.\Service_Config.cpp

 DEP_CPP_SERVICE_C=\

 	{$(INCLUDE)}"\.\Svc_Conf.h"\

@@ -3632,6 +8208,7 @@ DEP_CPP_SERVICE_C=\
 	{$(INCLUDE)}"\.\Reactor.i"\

 	{$(INCLUDE)}"\.\Handle_Set.i"\

 	{$(INCLUDE)}"\.\Pipe.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Service_Config.obj" : $(SOURCE) $(DEP_CPP_SERVICE_C) "$(INTDIR)"

@@ -3643,6 +8220,111 @@ DEP_CPP_SERVICE_C=\
 

 SOURCE=.\Remote_Tokens.cpp

 DEP_CPP_REMOT=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Remote_Tokens.h"\

+	".\Remote_Tokens.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\Singleton.cpp"\

+	".\Singleton.h"\

+	".\Singleton.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Token_Request_Reply.h"\

+	".\Token_Request_Reply.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_REMOT=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 	{$(INCLUDE)}"\.\Remote_Tokens.h"\

 	{$(INCLUDE)}"\.\Singleton.h"\

 	{$(INCLUDE)}"\.\Remote_Tokens.i"\

@@ -3746,6 +8428,7 @@ DEP_CPP_REMOT=\
 	{$(INCLUDE)}"\.\Synch.i"\

 	{$(INCLUDE)}"\.\Singleton.i"\

 	{$(INCLUDE)}"\.\Singleton.cpp"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Remote_Tokens.obj" : $(SOURCE) $(DEP_CPP_REMOT) "$(INTDIR)"

@@ -3757,6 +8440,110 @@ DEP_CPP_REMOT=\
 

 SOURCE=.\Remote_Name_Space.cpp

 DEP_CPP_REMOTE=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Name_Proxy.h"\

+	".\Name_Request_Reply.h"\

+	".\Name_Space.h"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Remote_Name_Space.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_REMOTE=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 	{$(INCLUDE)}"\.\Remote_Name_Space.h"\

 	{$(INCLUDE)}"\.\ACE.h"\

 	{$(INCLUDE)}"\.\SString.h"\

@@ -3859,6 +8646,7 @@ DEP_CPP_REMOTE=\
 	{$(INCLUDE)}"\.\Reactor.i"\

 	{$(INCLUDE)}"\.\Handle_Set.i"\

 	{$(INCLUDE)}"\.\Pipe.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Remote_Name_Space.obj" : $(SOURCE) $(DEP_CPP_REMOTE) "$(INTDIR)"

@@ -3870,6 +8658,104 @@ DEP_CPP_REMOTE=\
 

 SOURCE=.\Read_Buffer.cpp

 DEP_CPP_READ_=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Read_Buffer.h"\

+	".\Read_Buffer.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_READ_=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 	{$(INCLUDE)}"\.\Read_Buffer.h"\

 	{$(INCLUDE)}"\.\Service_Config.h"\

 	{$(INCLUDE)}"\.\ACE.h"\

@@ -3966,6 +8852,7 @@ DEP_CPP_READ_=\
 	{$(INCLUDE)}"\.\Addr.i"\

 	{$(INCLUDE)}"\.\IPC_SAP.i"\

 	{$(INCLUDE)}"\.\INET_Addr.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Read_Buffer.obj" : $(SOURCE) $(DEP_CPP_READ_) "$(INTDIR)"

@@ -3977,6 +8864,106 @@ DEP_CPP_READ_=\
 

 SOURCE=.\Reactor.cpp

 DEP_CPP_REACT=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_REACT=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 	{$(INCLUDE)}"\.\Synch_T.h"\

 	{$(INCLUDE)}"\.\SOCK_Acceptor.h"\

 	{$(INCLUDE)}"\.\SOCK_Connector.h"\

@@ -4075,6 +9062,7 @@ DEP_CPP_REACT=\
 	{$(INCLUDE)}"\.\Message_Queue.cpp"\

 	{$(INCLUDE)}"\.\Strategies_T.h"\

 	{$(INCLUDE)}"\.\Strategies_T.cpp"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Reactor.obj" : $(SOURCE) $(DEP_CPP_REACT) "$(INTDIR)"

@@ -4086,6 +9074,32 @@ DEP_CPP_REACT=\
 

 SOURCE=.\Profile_Timer.cpp

 DEP_CPP_PROFI=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Profile_Timer.h"\

+	".\Profile_Timer.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_PROFI=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\Profile_Timer.h"\

 	{$(INCLUDE)}"\.\Profile_Timer.i"\

 	{$(INCLUDE)}"\.\ACE.h"\

@@ -4102,6 +9116,7 @@ DEP_CPP_PROFI=\
 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

 	{$(INCLUDE)}"\.\Time_Value.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Profile_Timer.obj" : $(SOURCE) $(DEP_CPP_PROFI) "$(INTDIR)"

@@ -4113,6 +9128,96 @@ DEP_CPP_PROFI=\
 

 SOURCE=.\Process_Manager.cpp

 DEP_CPP_PROCE=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Process_Manager.h"\

+	".\Process_Manager.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_PROCE=\

+	".\..\STL\mutex.h"\

+	

+

+"$(INTDIR)\Process_Manager.obj" : $(SOURCE) $(DEP_CPP_PROCE) "$(INTDIR)"

+

+

+# End Source File

+################################################################################

+# Begin Source File

+

+SOURCE=.\Pipe.cpp

+DEP_CPP_PIPE_=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_PIPE_=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\Process_Manager.h"\

 	{$(INCLUDE)}"\.\Process_Manager.i"\

 	{$(INCLUDE)}"\.\Synch.h"\

@@ -4185,6 +9290,7 @@ DEP_CPP_PIPE_=\
 	{$(INCLUDE)}"\.\Time_Value.i"\

 	{$(INCLUDE)}"\.\SOCK_Connector.i"\

 	{$(INCLUDE)}"\.\Pipe.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Pipe.obj" : $(SOURCE) $(DEP_CPP_PIPE_) "$(INTDIR)"

@@ -4194,8 +9300,253 @@ DEP_CPP_PIPE_=\
 ################################################################################

 # Begin Source File

 

+<<<<<<< ace.mak
+SOURCE=.\Parse_Node.cpp

+

+!IF  "$(CFG)" == "ace - Win32 Release"

+

+DEP_CPP_PARSE=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Queue.cpp"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Module.h"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Parse_Node.h"\

+	".\Parse_Node.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Record.h"\

+	".\Service_Record.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\Stream.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_PARSE=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+	

+

+"$(INTDIR)\Parse_Node.obj" : $(SOURCE) $(DEP_CPP_PARSE) "$(INTDIR)"

+

+

+!ELSEIF  "$(CFG)" == "ace - Win32 Debug"

+

+=======
 SOURCE=.\Parse_Node.cpp

+>>>>>>> 4.8
 DEP_CPP_PARSE=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Queue.cpp"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Parse_Node.h"\

+	".\Parse_Node.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Record.h"\

+	".\Service_Record.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\Stream.cpp"\

+	".\Stream.h"\

+	".\Stream.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_PARSE=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 	{$(INCLUDE)}"\.\Service_Config.h"\

 	{$(INCLUDE)}"\.\Service_Repository.h"\

 	{$(INCLUDE)}"\.\Task.h"\

@@ -4310,6 +9661,7 @@ DEP_CPP_PARSE=\
 	{$(INCLUDE)}"\.\Task_T.h"\

 	{$(INCLUDE)}"\.\Task_T.i"\

 	{$(INCLUDE)}"\.\Task_T.cpp"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Parse_Node.obj" : $(SOURCE) $(DEP_CPP_PARSE) "$(INTDIR)"

@@ -4321,6 +9673,48 @@ DEP_CPP_PARSE=\
 

 SOURCE=.\OS.cpp

 DEP_CPP_OS_CP=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\ARGV.h"\

+	".\ARGV.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_OS_CP=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\OS.h"\

 	{$(INCLUDE)}"\.\ARGV.h"\

 	{$(INCLUDE)}"\.\OS.i"\

@@ -4353,6 +9747,7 @@ DEP_CPP_OS_CP=\
 	{$(INCLUDE)}"\.\Thread.i"\

 	{$(INCLUDE)}"\.\Set.i"\

 	{$(INCLUDE)}"\.\Set.cpp"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\OS.obj" : $(SOURCE) $(DEP_CPP_OS_CP) "$(INTDIR)"

@@ -4364,6 +9759,31 @@ DEP_CPP_OS_CP=\
 

 SOURCE=.\Obstack.cpp

 DEP_CPP_OBSTA=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Obstack.h"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_OBSTA=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\Obstack.h"\

 	{$(INCLUDE)}"\.\ACE.h"\

 	{$(INCLUDE)}"\.\OS.h"\

@@ -4379,6 +9799,7 @@ DEP_CPP_OBSTA=\
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Obstack.obj" : $(SOURCE) $(DEP_CPP_OBSTA) "$(INTDIR)"

@@ -4390,6 +9811,116 @@ DEP_CPP_OBSTA=\
 

 SOURCE=.\Naming_Context.cpp

 DEP_CPP_NAMIN=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Get_Opt.h"\

+	".\Get_Opt.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Name_Space.h"\

+	".\Local_Name_Space_T.cpp"\

+	".\Local_Name_Space_T.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Name_Proxy.h"\

+	".\Name_Request_Reply.h"\

+	".\Name_Space.h"\

+	".\Naming_Context.h"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Remote_Name_Space.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_NAMIN=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 	{$(INCLUDE)}"\.\Get_Opt.h"\

 	{$(INCLUDE)}"\.\Naming_Context.h"\

 	{$(INCLUDE)}"\.\Remote_Name_Space.h"\

@@ -4498,6 +10029,7 @@ DEP_CPP_NAMIN=\
 	{$(INCLUDE)}"\.\Pipe.i"\

 	{$(INCLUDE)}"\.\Local_Name_Space_T.h"\

 	{$(INCLUDE)}"\.\Local_Name_Space_T.cpp"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Naming_Context.obj" : $(SOURCE) $(DEP_CPP_NAMIN) "$(INTDIR)"

@@ -4509,6 +10041,109 @@ DEP_CPP_NAMIN=\
 

 SOURCE=.\Name_Space.cpp

 DEP_CPP_NAME_=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Name_Proxy.h"\

+	".\Name_Request_Reply.h"\

+	".\Name_Space.h"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_NAME_=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 	{$(INCLUDE)}"\.\Name_Space.h"\

 	{$(INCLUDE)}"\.\ACE.h"\

 	{$(INCLUDE)}"\.\SString.h"\

@@ -4610,6 +10245,7 @@ DEP_CPP_NAME_=\
 	{$(INCLUDE)}"\.\Reactor.i"\

 	{$(INCLUDE)}"\.\Handle_Set.i"\

 	{$(INCLUDE)}"\.\Pipe.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Name_Space.obj" : $(SOURCE) $(DEP_CPP_NAME_) "$(INTDIR)"

@@ -4621,6 +10257,33 @@ DEP_CPP_NAME_=\
 

 SOURCE=.\Name_Request_Reply.cpp

 DEP_CPP_NAME_R=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Name_Request_Reply.h"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_NAME_R=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\Name_Request_Reply.h"\

 	{$(INCLUDE)}"\.\Time_Value.h"\

 	{$(INCLUDE)}"\.\SString.h"\

@@ -4638,6 +10301,7 @@ DEP_CPP_NAME_R=\
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Name_Request_Reply.obj" : $(SOURCE) $(DEP_CPP_NAME_R) "$(INTDIR)"

@@ -4649,6 +10313,108 @@ DEP_CPP_NAME_R=\
 

 SOURCE=.\Name_Proxy.cpp

 DEP_CPP_NAME_P=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Name_Proxy.h"\

+	".\Name_Request_Reply.h"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_NAME_P=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 	{$(INCLUDE)}"\.\Name_Proxy.h"\

 	{$(INCLUDE)}"\.\INET_Addr.h"\

 	{$(INCLUDE)}"\.\SOCK_Connector.h"\

@@ -4749,6 +10515,7 @@ DEP_CPP_NAME_P=\
 	{$(INCLUDE)}"\.\Pipe.i"\

 	{$(INCLUDE)}"\.\SString.h"\

 	{$(INCLUDE)}"\.\SString.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Name_Proxy.obj" : $(SOURCE) $(DEP_CPP_NAME_P) "$(INTDIR)"

@@ -4758,8 +10525,241 @@ DEP_CPP_NAME_P=\
 ################################################################################

 # Begin Source File

 

+<<<<<<< ace.mak
 SOURCE=.\Multiplexor.cpp

+

+!IF  "$(CFG)" == "ace - Win32 Release"

+

 DEP_CPP_MULTI=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Queue.cpp"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Module.h"\

+	".\Multiplexor.h"\

+	".\Multiplexor.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_MULTI=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+	

+

+"$(INTDIR)\Multiplexor.obj" : $(SOURCE) $(DEP_CPP_MULTI) "$(INTDIR)"

+

+

+!ELSEIF  "$(CFG)" == "ace - Win32 Debug"

+

+=======
+SOURCE=.\Multiplexor.cpp

+>>>>>>> 4.8
+DEP_CPP_MULTI=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Queue.cpp"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Multiplexor.h"\

+	".\Multiplexor.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_MULTI=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 	{$(INCLUDE)}"\.\Multiplexor.h"\

 	{$(INCLUDE)}"\.\Multiplexor.i"\

 	{$(INCLUDE)}"\.\Module.h"\

@@ -4867,6 +10867,7 @@ DEP_CPP_MULTI=\
 	{$(INCLUDE)}"\.\Stream_Modules.cpp"\

 	{$(INCLUDE)}"\.\Map_Manager.i"\

 	{$(INCLUDE)}"\.\Map_Manager.cpp"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Multiplexor.obj" : $(SOURCE) $(DEP_CPP_MULTI) "$(INTDIR)"

@@ -4878,6 +10879,58 @@ DEP_CPP_MULTI=\
 

 SOURCE=.\Message_Block.cpp

 DEP_CPP_MESSA=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Signal.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_MESSA=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 	{$(INCLUDE)}"\.\Message_Block.h"\

 	{$(INCLUDE)}"\.\Message_Block.i"\

 	{$(INCLUDE)}"\.\ACE.h"\

@@ -4921,6 +10974,7 @@ DEP_CPP_MESSA=\
 	{$(INCLUDE)}"\.\Set.i"\

 	{$(INCLUDE)}"\.\Set.cpp"\

 	{$(INCLUDE)}"\.\Mem_Map.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Message_Block.obj" : $(SOURCE) $(DEP_CPP_MESSA) "$(INTDIR)"

@@ -4932,6 +10986,51 @@ DEP_CPP_MESSA=\
 

 SOURCE=.\Memory_Pool.cpp

 DEP_CPP_MEMOR=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Signal.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_MEMOR=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\Memory_Pool.h"\

 	{$(INCLUDE)}"\.\Memory_Pool.i"\

 	{$(INCLUDE)}"\.\ACE.h"\

@@ -4968,6 +11067,7 @@ DEP_CPP_MEMOR=\
 	{$(INCLUDE)}"\.\SV_Semaphore_Simple.h"\

 	{$(INCLUDE)}"\.\SV_Semaphore_Complex.i"\

 	{$(INCLUDE)}"\.\SV_Semaphore_Simple.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Memory_Pool.obj" : $(SOURCE) $(DEP_CPP_MEMOR) "$(INTDIR)"

@@ -4979,6 +11079,32 @@ DEP_CPP_MEMOR=\
 

 SOURCE=.\Mem_Map.cpp

 DEP_CPP_MEM_M=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_MEM_M=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\Mem_Map.h"\

 	{$(INCLUDE)}"\.\Mem_Map.i"\

 	{$(INCLUDE)}"\.\ACE.h"\

@@ -4995,6 +11121,7 @@ DEP_CPP_MEM_M=\
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Mem_Map.obj" : $(SOURCE) $(DEP_CPP_MEM_M) "$(INTDIR)"

@@ -5006,6 +11133,56 @@ DEP_CPP_MEM_M=\
 

 SOURCE=.\Malloc.cpp

 DEP_CPP_MALLO=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Signal.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_MALLO=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 	{$(INCLUDE)}"\.\Malloc.h"\

 	{$(INCLUDE)}"\.\Malloc.i"\

 	{$(INCLUDE)}"\.\ACE.h"\

@@ -5047,6 +11224,7 @@ DEP_CPP_MALLO=\
 	{$(INCLUDE)}"\.\Set.i"\

 	{$(INCLUDE)}"\.\Set.cpp"\

 	{$(INCLUDE)}"\.\Mem_Map.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Malloc.obj" : $(SOURCE) $(DEP_CPP_MALLO) "$(INTDIR)"

@@ -5058,6 +11236,46 @@ DEP_CPP_MALLO=\
 

 SOURCE=.\LSOCK_Stream.cpp

 DEP_CPP_LSOCK=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\LSOCK.h"\

+	".\LSOCK.i"\

+	".\LSOCK_Stream.h"\

+	".\LSOCK_Stream.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_LSOCK=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\LSOCK_Stream.h"\

 	{$(INCLUDE)}"\.\SOCK_Stream.h"\

 	{$(INCLUDE)}"\.\LSOCK.h"\

@@ -5088,6 +11306,7 @@ DEP_CPP_LSOCK=\
 	{$(INCLUDE)}"\.\IPC_SAP.i"\

 	{$(INCLUDE)}"\.\INET_Addr.i"\

 	{$(INCLUDE)}"\.\LSOCK.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\LSOCK_Stream.obj" : $(SOURCE) $(DEP_CPP_LSOCK) "$(INTDIR)"

@@ -5099,6 +11318,42 @@ DEP_CPP_LSOCK=\
 

 SOURCE=.\LSOCK_Dgram.cpp

 DEP_CPP_LSOCK_=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\LSOCK.h"\

+	".\LSOCK.i"\

+	".\LSOCK_Dgram.h"\

+	".\LSOCK_Dgram.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Dgram.h"\

+	".\SOCK_Dgram.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_LSOCK_=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\LSOCK_Dgram.h"\

 	{$(INCLUDE)}"\.\SOCK_Dgram.h"\

 	{$(INCLUDE)}"\.\LSOCK.h"\

@@ -5125,6 +11380,7 @@ DEP_CPP_LSOCK_=\
 	{$(INCLUDE)}"\.\IPC_SAP.i"\

 	{$(INCLUDE)}"\.\Addr.i"\

 	{$(INCLUDE)}"\.\LSOCK.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\LSOCK_Dgram.obj" : $(SOURCE) $(DEP_CPP_LSOCK_) "$(INTDIR)"

@@ -5136,6 +11392,52 @@ DEP_CPP_LSOCK_=\
 

 SOURCE=.\LSOCK_Connector.cpp

 DEP_CPP_LSOCK_C=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\LSOCK.h"\

+	".\LSOCK.i"\

+	".\LSOCK_Connector.h"\

+	".\LSOCK_Connector.i"\

+	".\LSOCK_Stream.h"\

+	".\LSOCK_Stream.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	".\UNIX_Addr.h"\

+	".\UNIX_Addr.i"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_LSOCK_C=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\LSOCK_Connector.h"\

 	{$(INCLUDE)}"\.\SOCK_Connector.h"\

 	{$(INCLUDE)}"\.\LSOCK_Stream.h"\

@@ -5172,6 +11474,7 @@ DEP_CPP_LSOCK_C=\
 	{$(INCLUDE)}"\.\LSOCK_Stream.i"\

 	{$(INCLUDE)}"\.\LSOCK.i"\

 	{$(INCLUDE)}"\.\UNIX_Addr.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\LSOCK_Connector.obj" : $(SOURCE) $(DEP_CPP_LSOCK_C) "$(INTDIR)"

@@ -5186,6 +11489,41 @@ SOURCE=.\LSOCK_CODgram.cpp
 !IF  "$(CFG)" == "ace - Win32 Release"

 

 DEP_CPP_LSOCK_CO=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\LSOCK.h"\

+	".\LSOCK.i"\

+	".\LSOCK_CODgram.h"\

+	".\LSOCK_CODgram.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_CODgram.h"\

+	".\SOCK_CODgram.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+=======
 	{$(INCLUDE)}"\.\LSOCK_CODgram.h"\

 	{$(INCLUDE)}"\.\LSOCK.h"\

 	{$(INCLUDE)}"\.\SOCK_CODgram.h"\

@@ -5211,7 +11549,67 @@ DEP_CPP_LSOCK_CO=\
 	{$(INCLUDE)}"\.\Log_Record.i"\

 	{$(INCLUDE)}"\.\IPC_SAP.i"\

 	{$(INCLUDE)}"\.\Addr.i"\

+>>>>>>> 4.8
+	

+<<<<<<< ace.mak
+NODEP_CPP_LSOCK_CO=\

+	".\..\STL\mutex.h"\

+	

+

+"$(INTDIR)\LSOCK_CODgram.obj" : $(SOURCE) $(DEP_CPP_LSOCK_CO) "$(INTDIR)"

+

+

+# End Source File

+################################################################################

+# Begin Source File

+

+SOURCE=.\LSOCK_Acceptor.cpp

+DEP_CPP_LSOCK_A=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\LSOCK.h"\

+	".\LSOCK.i"\

+	".\LSOCK_Acceptor.h"\

+	".\LSOCK_Acceptor.i"\

+	".\LSOCK_Stream.h"\

+	".\LSOCK_Stream.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	".\UNIX_Addr.h"\

+	".\UNIX_Addr.i"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

 	

+NODEP_CPP_LSOCK_A=\

+	".\..\STL\mutex.h"\

+=======
 

 "$(INTDIR)\LSOCK_CODgram.obj" : $(SOURCE) $(DEP_CPP_LSOCK_CO) "$(INTDIR)"

 

@@ -5296,6 +11694,7 @@ DEP_CPP_LSOCK_A=\
 	{$(INCLUDE)}"\.\LSOCK.h"\

 	{$(INCLUDE)}"\.\LSOCK_Stream.i"\

 	{$(INCLUDE)}"\.\LSOCK.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\LSOCK_Acceptor.obj" : $(SOURCE) $(DEP_CPP_LSOCK_A) "$(INTDIR)"

@@ -5307,6 +11706,38 @@ DEP_CPP_LSOCK_A=\
 

 SOURCE=.\LSOCK.cpp

 DEP_CPP_LSOCK_CP=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\LSOCK.h"\

+	".\LSOCK.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_LSOCK_CP=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\LSOCK.h"\

 	{$(INCLUDE)}"\.\SOCK.h"\

 	{$(INCLUDE)}"\.\LSOCK.i"\

@@ -5329,6 +11760,7 @@ DEP_CPP_LSOCK_CP=\
 	{$(INCLUDE)}"\.\Log_Record.i"\

 	{$(INCLUDE)}"\.\Addr.i"\

 	{$(INCLUDE)}"\.\IPC_SAP.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\LSOCK.obj" : $(SOURCE) $(DEP_CPP_LSOCK_CP) "$(INTDIR)"

@@ -5340,6 +11772,30 @@ DEP_CPP_LSOCK_CP=\
 

 SOURCE=.\Log_Record.cpp

 DEP_CPP_LOG_R=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_LOG_R=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\ACE.h"\

@@ -5354,6 +11810,7 @@ DEP_CPP_LOG_R=\
 	{$(INCLUDE)}"\.\OS.i"\

 	{$(INCLUDE)}"\.\config.h"\

 	{$(INCLUDE)}"\.\Time_Value.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Log_Record.obj" : $(SOURCE) $(DEP_CPP_LOG_R) "$(INTDIR)"

@@ -5365,6 +11822,61 @@ DEP_CPP_LOG_R=\
 

 SOURCE=.\Log_Msg.cpp

 DEP_CPP_LOG_M=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\FIFO.h"\

+	".\FIFO.i"\

+	".\FIFO_Send.h"\

+	".\FIFO_Send.i"\

+	".\FIFO_Send_Msg.h"\

+	".\FIFO_Send_Msg.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SPIPE_Connector.h"\

+	".\SPIPE_Connector.i"\

+	".\SPIPE_Stream.h"\

+	".\SPIPE_Stream.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_LOG_M=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\config.h"\

 	{$(INCLUDE)}"\.\ACE.h"\

 	{$(INCLUDE)}"\.\Thread.h"\

@@ -5410,6 +11922,7 @@ DEP_CPP_LOG_M=\
 	{$(INCLUDE)}"\.\FIFO.h"\

 	{$(INCLUDE)}"\.\FIFO_Send.i"\

 	{$(INCLUDE)}"\.\FIFO.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Log_Msg.obj" : $(SOURCE) $(DEP_CPP_LOG_M) "$(INTDIR)"

@@ -5421,6 +11934,104 @@ DEP_CPP_LOG_M=\
 

 SOURCE=.\Local_Tokens.cpp

 DEP_CPP_LOCAL=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Token_Manager.h"\

+	".\Token_Manager.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_LOCAL=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 	{$(INCLUDE)}"\.\Thread.h"\

 	{$(INCLUDE)}"\.\Local_Tokens.h"\

 	{$(INCLUDE)}"\.\Token_Manager.h"\

@@ -5517,6 +12128,7 @@ DEP_CPP_LOCAL=\
 	{$(INCLUDE)}"\.\IPC_SAP.i"\

 	{$(INCLUDE)}"\.\INET_Addr.i"\

 	{$(INCLUDE)}"\.\Token_Manager.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Local_Tokens.obj" : $(SOURCE) $(DEP_CPP_LOCAL) "$(INTDIR)"

@@ -5528,6 +12140,113 @@ DEP_CPP_LOCAL=\
 

 SOURCE=.\Local_Name_Space.cpp

 DEP_CPP_LOCAL_=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Name_Space.h"\

+	".\Local_Name_Space_T.cpp"\

+	".\Local_Name_Space_T.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Name_Proxy.h"\

+	".\Name_Request_Reply.h"\

+	".\Name_Space.h"\

+	".\Naming_Context.h"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_LOCAL_=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 	{$(INCLUDE)}"\.\ACE.h"\

 	{$(INCLUDE)}"\.\Local_Name_Space.h"\

 	{$(INCLUDE)}"\.\OS.h"\

@@ -5633,6 +12352,7 @@ DEP_CPP_LOCAL_=\
 	{$(INCLUDE)}"\.\SOCK_Connector.h"\

 	{$(INCLUDE)}"\.\Name_Request_Reply.h"\

 	{$(INCLUDE)}"\.\SOCK_Connector.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Local_Name_Space.obj" : $(SOURCE) $(DEP_CPP_LOCAL_) "$(INTDIR)"

@@ -5644,6 +12364,32 @@ DEP_CPP_LOCAL_=\
 

 SOURCE=.\IPC_SAP.cpp

 DEP_CPP_IPC_S=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_IPC_S=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\IPC_SAP.h"\

 	{$(INCLUDE)}"\.\ACE.h"\

 	{$(INCLUDE)}"\.\IPC_SAP.i"\

@@ -5660,6 +12406,7 @@ DEP_CPP_IPC_S=\
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\IPC_SAP.obj" : $(SOURCE) $(DEP_CPP_IPC_S) "$(INTDIR)"

@@ -5671,6 +12418,32 @@ DEP_CPP_IPC_S=\
 

 SOURCE=.\IO_SAP.cpp

 DEP_CPP_IO_SA=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_IO_SA=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\IO_SAP.h"\

 	{$(INCLUDE)}"\.\ACE.h"\

 	{$(INCLUDE)}"\.\IO_SAP.i"\

@@ -5687,6 +12460,7 @@ DEP_CPP_IO_SA=\
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\IO_SAP.obj" : $(SOURCE) $(DEP_CPP_IO_SA) "$(INTDIR)"

@@ -5707,6 +12481,34 @@ SOURCE=.\IO_Cntl_Msg.cpp
 

 SOURCE=.\INET_Addr.cpp

 DEP_CPP_INET_=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_INET_=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\INET_Addr.h"\

 	{$(INCLUDE)}"\.\INET_Addr.i"\

 	{$(INCLUDE)}"\.\ACE.h"\

@@ -5725,6 +12527,7 @@ DEP_CPP_INET_=\
 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

 	{$(INCLUDE)}"\.\Addr.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\INET_Addr.obj" : $(SOURCE) $(DEP_CPP_INET_) "$(INTDIR)"

@@ -5736,6 +12539,32 @@ DEP_CPP_INET_=\
 

 SOURCE=.\High_Res_Timer.cpp

 DEP_CPP_HIGH_=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_HIGH_=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\High_Res_Timer.h"\

 	{$(INCLUDE)}"\.\High_Res_Timer.i"\

 	{$(INCLUDE)}"\.\ACE.h"\

@@ -5752,6 +12581,7 @@ DEP_CPP_HIGH_=\
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\High_Res_Timer.obj" : $(SOURCE) $(DEP_CPP_HIGH_) "$(INTDIR)"

@@ -5763,6 +12593,32 @@ DEP_CPP_HIGH_=\
 

 SOURCE=.\Handle_Set.cpp

 DEP_CPP_HANDL=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_HANDL=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\Handle_Set.h"\

 	{$(INCLUDE)}"\.\Handle_Set.i"\

 	{$(INCLUDE)}"\.\ACE.h"\

@@ -5779,6 +12635,7 @@ DEP_CPP_HANDL=\
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Handle_Set.obj" : $(SOURCE) $(DEP_CPP_HANDL) "$(INTDIR)"

@@ -5790,6 +12647,32 @@ DEP_CPP_HANDL=\
 

 SOURCE=.\Get_Opt.cpp

 DEP_CPP_GET_O=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Get_Opt.h"\

+	".\Get_Opt.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_GET_O=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\Get_Opt.h"\

 	{$(INCLUDE)}"\.\Get_Opt.i"\

 	{$(INCLUDE)}"\.\ACE.h"\

@@ -5806,6 +12689,7 @@ DEP_CPP_GET_O=\
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Get_Opt.obj" : $(SOURCE) $(DEP_CPP_GET_O) "$(INTDIR)"

@@ -5817,6 +12701,40 @@ DEP_CPP_GET_O=\
 

 SOURCE=.\FILE_IO.cpp

 DEP_CPP_FILE_=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\FILE.h"\

+	".\FILE.i"\

+	".\FILE_Addr.h"\

+	".\FILE_Addr.i"\

+	".\FILE_IO.h"\

+	".\FILE_IO.i"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_FILE_=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\FILE_IO.h"\

 	{$(INCLUDE)}"\.\FILE.h"\

 	{$(INCLUDE)}"\.\FILE_Addr.h"\

@@ -5841,6 +12759,7 @@ DEP_CPP_FILE_=\
 	{$(INCLUDE)}"\.\Addr.h"\

 	{$(INCLUDE)}"\.\FILE_Addr.i"\

 	{$(INCLUDE)}"\.\Addr.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\FILE_IO.obj" : $(SOURCE) $(DEP_CPP_FILE_) "$(INTDIR)"

@@ -5852,6 +12771,42 @@ DEP_CPP_FILE_=\
 

 SOURCE=.\FILE_Connector.cpp

 DEP_CPP_FILE_C=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\FILE.h"\

+	".\FILE.i"\

+	".\FILE_Addr.h"\

+	".\FILE_Addr.i"\

+	".\FILE_Connector.h"\

+	".\FILE_Connector.i"\

+	".\FILE_IO.h"\

+	".\FILE_IO.i"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_FILE_C=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\FILE_Connector.h"\

 	{$(INCLUDE)}"\.\FILE_IO.h"\

 	{$(INCLUDE)}"\.\FILE_Connector.i"\

@@ -5878,6 +12833,7 @@ DEP_CPP_FILE_C=\
 	{$(INCLUDE)}"\.\Addr.h"\

 	{$(INCLUDE)}"\.\FILE_Addr.i"\

 	{$(INCLUDE)}"\.\Addr.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\FILE_Connector.obj" : $(SOURCE) $(DEP_CPP_FILE_C) "$(INTDIR)"

@@ -5889,6 +12845,34 @@ DEP_CPP_FILE_C=\
 

 SOURCE=.\FILE_Addr.cpp

 DEP_CPP_FILE_A=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\FILE_Addr.h"\

+	".\FILE_Addr.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_FILE_A=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\FILE_Addr.h"\

 	{$(INCLUDE)}"\.\FILE_Addr.i"\

 	{$(INCLUDE)}"\.\Addr.h"\

@@ -5907,6 +12891,7 @@ DEP_CPP_FILE_A=\
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\FILE_Addr.obj" : $(SOURCE) $(DEP_CPP_FILE_A) "$(INTDIR)"

@@ -5918,6 +12903,38 @@ DEP_CPP_FILE_A=\
 

 SOURCE=.\FILE.cpp

 DEP_CPP_FILE_CP=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\FILE.h"\

+	".\FILE.i"\

+	".\FILE_Addr.h"\

+	".\FILE_Addr.i"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_FILE_CP=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\FILE.h"\

 	{$(INCLUDE)}"\.\IO_SAP.h"\

 	{$(INCLUDE)}"\.\FILE_Addr.h"\

@@ -5940,6 +12957,7 @@ DEP_CPP_FILE_CP=\
 	{$(INCLUDE)}"\.\Addr.h"\

 	{$(INCLUDE)}"\.\FILE_Addr.i"\

 	{$(INCLUDE)}"\.\Addr.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\FILE.obj" : $(SOURCE) $(DEP_CPP_FILE_CP) "$(INTDIR)"

@@ -5951,6 +12969,38 @@ DEP_CPP_FILE_CP=\
 

 SOURCE=.\FIFO_Send_Msg.cpp

 DEP_CPP_FIFO_=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\FIFO.h"\

+	".\FIFO.i"\

+	".\FIFO_Send.h"\

+	".\FIFO_Send.i"\

+	".\FIFO_Send_Msg.h"\

+	".\FIFO_Send_Msg.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_FIFO_=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\FIFO_Send_Msg.h"\

 	{$(INCLUDE)}"\.\FIFO_Send.h"\

 	{$(INCLUDE)}"\.\FIFO_Send_Msg.i"\

@@ -5973,6 +13023,7 @@ DEP_CPP_FIFO_=\
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\FIFO_Send_Msg.obj" : $(SOURCE) $(DEP_CPP_FIFO_) "$(INTDIR)"

@@ -5984,6 +13035,36 @@ DEP_CPP_FIFO_=\
 

 SOURCE=.\FIFO_Send.cpp

 DEP_CPP_FIFO_S=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\FIFO.h"\

+	".\FIFO.i"\

+	".\FIFO_Send.h"\

+	".\FIFO_Send.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_FIFO_S=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\FIFO_Send.h"\

 	{$(INCLUDE)}"\.\FIFO.h"\

 	{$(INCLUDE)}"\.\FIFO_Send.i"\

@@ -6004,6 +13085,7 @@ DEP_CPP_FIFO_S=\
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\FIFO_Send.obj" : $(SOURCE) $(DEP_CPP_FIFO_S) "$(INTDIR)"

@@ -6015,6 +13097,38 @@ DEP_CPP_FIFO_S=\
 

 SOURCE=.\FIFO_Recv_Msg.cpp

 DEP_CPP_FIFO_R=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\FIFO.h"\

+	".\FIFO.i"\

+	".\FIFO_Recv.h"\

+	".\FIFO_Recv.i"\

+	".\FIFO_Recv_Msg.h"\

+	".\FIFO_Recv_Msg.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_FIFO_R=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\FIFO_Recv_Msg.h"\

 	{$(INCLUDE)}"\.\FIFO_Recv.h"\

 	{$(INCLUDE)}"\.\FIFO_Recv_Msg.i"\

@@ -6037,6 +13151,7 @@ DEP_CPP_FIFO_R=\
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\FIFO_Recv_Msg.obj" : $(SOURCE) $(DEP_CPP_FIFO_R) "$(INTDIR)"

@@ -6048,6 +13163,36 @@ DEP_CPP_FIFO_R=\
 

 SOURCE=.\FIFO_Recv.cpp

 DEP_CPP_FIFO_RE=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\FIFO.h"\

+	".\FIFO.i"\

+	".\FIFO_Recv.h"\

+	".\FIFO_Recv.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_FIFO_RE=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\FIFO_Recv.h"\

 	{$(INCLUDE)}"\.\FIFO.h"\

 	{$(INCLUDE)}"\.\FIFO_Recv.i"\

@@ -6068,6 +13213,7 @@ DEP_CPP_FIFO_RE=\
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\FIFO_Recv.obj" : $(SOURCE) $(DEP_CPP_FIFO_RE) "$(INTDIR)"

@@ -6079,6 +13225,58 @@ DEP_CPP_FIFO_RE=\
 

 SOURCE=.\Event_Handler.cpp

 DEP_CPP_EVENT=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Signal.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_EVENT=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 	{$(INCLUDE)}"\.\Event_Handler.h"\

 	{$(INCLUDE)}"\.\Message_Block.h"\

 	{$(INCLUDE)}"\.\Event_Handler.i"\

@@ -6122,6 +13320,7 @@ DEP_CPP_EVENT=\
 	{$(INCLUDE)}"\.\Set.i"\

 	{$(INCLUDE)}"\.\Set.cpp"\

 	{$(INCLUDE)}"\.\Mem_Map.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Event_Handler.obj" : $(SOURCE) $(DEP_CPP_EVENT) "$(INTDIR)"

@@ -6133,6 +13332,32 @@ DEP_CPP_EVENT=\
 

 SOURCE=.\Dynamic.cpp

 DEP_CPP_DYNAM=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Dynamic.h"\

+	".\Dynamic.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_DYNAM=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\Dynamic.h"\

 	{$(INCLUDE)}"\.\Dynamic.i"\

 	{$(INCLUDE)}"\.\ACE.h"\

@@ -6149,6 +13374,7 @@ DEP_CPP_DYNAM=\
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Dynamic.obj" : $(SOURCE) $(DEP_CPP_DYNAM) "$(INTDIR)"

@@ -6160,6 +13386,46 @@ DEP_CPP_DYNAM=\
 

 SOURCE=.\Dump.cpp

 DEP_CPP_DUMP_=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Dump.h"\

+	".\Dump_T.cpp"\

+	".\Dump_T.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_DUMP_=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\Dump.h"\

 	{$(INCLUDE)}"\.\Synch.h"\

 	{$(INCLUDE)}"\.\Dump_T.h"\

@@ -6190,6 +13456,7 @@ DEP_CPP_DUMP_=\
 	{$(INCLUDE)}"\.\Thread.h"\

 	{$(INCLUDE)}"\.\Thread.i"\

 	{$(INCLUDE)}"\.\Dump_T.cpp"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Dump.obj" : $(SOURCE) $(DEP_CPP_DUMP_) "$(INTDIR)"

@@ -6201,6 +13468,40 @@ DEP_CPP_DUMP_=\
 

 SOURCE=.\DEV_IO.cpp

 DEP_CPP_DEV_I=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\DEV.h"\

+	".\DEV.i"\

+	".\DEV_Addr.h"\

+	".\DEV_Addr.i"\

+	".\DEV_IO.h"\

+	".\DEV_IO.i"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_DEV_I=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\DEV_IO.h"\

 	{$(INCLUDE)}"\.\DEV.h"\

 	{$(INCLUDE)}"\.\DEV_Addr.h"\

@@ -6225,6 +13526,7 @@ DEP_CPP_DEV_I=\
 	{$(INCLUDE)}"\.\Addr.h"\

 	{$(INCLUDE)}"\.\DEV_Addr.i"\

 	{$(INCLUDE)}"\.\Addr.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\DEV_IO.obj" : $(SOURCE) $(DEP_CPP_DEV_I) "$(INTDIR)"

@@ -6236,6 +13538,42 @@ DEP_CPP_DEV_I=\
 

 SOURCE=.\DEV_Connector.cpp

 DEP_CPP_DEV_C=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\DEV.h"\

+	".\DEV.i"\

+	".\DEV_Addr.h"\

+	".\DEV_Addr.i"\

+	".\DEV_Connector.h"\

+	".\DEV_Connector.i"\

+	".\DEV_IO.h"\

+	".\DEV_IO.i"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_DEV_C=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\DEV_Connector.h"\

 	{$(INCLUDE)}"\.\DEV_IO.h"\

 	{$(INCLUDE)}"\.\DEV_Connector.i"\

@@ -6262,6 +13600,7 @@ DEP_CPP_DEV_C=\
 	{$(INCLUDE)}"\.\Addr.h"\

 	{$(INCLUDE)}"\.\DEV_Addr.i"\

 	{$(INCLUDE)}"\.\Addr.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\DEV_Connector.obj" : $(SOURCE) $(DEP_CPP_DEV_C) "$(INTDIR)"

@@ -6273,6 +13612,34 @@ DEP_CPP_DEV_C=\
 

 SOURCE=.\DEV_Addr.cpp

 DEP_CPP_DEV_A=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\DEV_Addr.h"\

+	".\DEV_Addr.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_DEV_A=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\DEV_Addr.h"\

 	{$(INCLUDE)}"\.\DEV_Addr.i"\

 	{$(INCLUDE)}"\.\Addr.h"\

@@ -6291,6 +13658,7 @@ DEP_CPP_DEV_A=\
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\DEV_Addr.obj" : $(SOURCE) $(DEP_CPP_DEV_A) "$(INTDIR)"

@@ -6302,6 +13670,38 @@ DEP_CPP_DEV_A=\
 

 SOURCE=.\DEV.cpp

 DEP_CPP_DEV_CP=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\DEV.h"\

+	".\DEV.i"\

+	".\DEV_Addr.h"\

+	".\DEV_Addr.i"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_DEV_CP=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\DEV.h"\

 	{$(INCLUDE)}"\.\IO_SAP.h"\

 	{$(INCLUDE)}"\.\DEV_Addr.h"\

@@ -6324,6 +13724,7 @@ DEP_CPP_DEV_CP=\
 	{$(INCLUDE)}"\.\Addr.h"\

 	{$(INCLUDE)}"\.\DEV_Addr.i"\

 	{$(INCLUDE)}"\.\Addr.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\DEV.obj" : $(SOURCE) $(DEP_CPP_DEV_CP) "$(INTDIR)"

@@ -6335,6 +13736,32 @@ DEP_CPP_DEV_CP=\
 

 SOURCE=.\Date_Time.cpp

 DEP_CPP_DATE_=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Date_Time.h"\

+	".\Date_Time.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_DATE_=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\Date_Time.h"\

 	{$(INCLUDE)}"\.\ACE.h"\

 	{$(INCLUDE)}"\.\Date_Time.i"\

@@ -6351,6 +13778,7 @@ DEP_CPP_DATE_=\
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Date_Time.obj" : $(SOURCE) $(DEP_CPP_DATE_) "$(INTDIR)"

@@ -6362,6 +13790,104 @@ DEP_CPP_DATE_=\
 

 SOURCE=.\CORBA_Handler.cpp

 DEP_CPP_CORBA=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\CORBA_Handler.h"\

+	".\CORBA_Handler.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_CORBA=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 	{$(INCLUDE)}"\.\CORBA_Handler.h"\

 	{$(INCLUDE)}"\.\CORBA_Handler.i"\

 	{$(INCLUDE)}"\.\Service_Config.h"\

@@ -6458,6 +13984,7 @@ DEP_CPP_CORBA=\
 	{$(INCLUDE)}"\.\IPC_SAP.i"\

 	{$(INCLUDE)}"\.\INET_Addr.i"\

 	{$(INCLUDE)}"\.\Pipe.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\CORBA_Handler.obj" : $(SOURCE) $(DEP_CPP_CORBA) "$(INTDIR)"

@@ -6469,6 +13996,32 @@ DEP_CPP_CORBA=\
 

 SOURCE=.\ARGV.cpp

 DEP_CPP_ARGV_=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\ARGV.h"\

+	".\ARGV.i"\

+	".\config.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_ARGV_=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\ARGV.h"\

 	{$(INCLUDE)}"\.\ARGV.i"\

 	{$(INCLUDE)}"\.\ACE.h"\

@@ -6485,6 +14038,7 @@ DEP_CPP_ARGV_=\
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\ARGV.obj" : $(SOURCE) $(DEP_CPP_ARGV_) "$(INTDIR)"

@@ -6496,6 +14050,32 @@ DEP_CPP_ARGV_=\
 

 SOURCE=.\Addr.cpp

 DEP_CPP_ADDR_=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_ADDR_=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\Addr.h"\

 	{$(INCLUDE)}"\.\Addr.i"\

 	{$(INCLUDE)}"\.\ACE.h"\

@@ -6512,6 +14092,7 @@ DEP_CPP_ADDR_=\
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Addr.obj" : $(SOURCE) $(DEP_CPP_ADDR_) "$(INTDIR)"

@@ -6523,6 +14104,102 @@ DEP_CPP_ADDR_=\
 

 SOURCE=.\ACE.cpp

 DEP_CPP_ACE_C=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_ACE_C=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 	{$(INCLUDE)}"\.\IPC_SAP.h"\

 	{$(INCLUDE)}"\.\Time_Value.h"\

 	{$(INCLUDE)}"\.\Handle_Set.h"\

@@ -6617,6 +14294,7 @@ DEP_CPP_ACE_C=\
 	{$(INCLUDE)}"\.\Message_Queue.cpp"\

 	{$(INCLUDE)}"\.\Strategies_T.h"\

 	{$(INCLUDE)}"\.\Strategies_T.cpp"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\ACE.obj" : $(SOURCE) $(DEP_CPP_ACE_C) "$(INTDIR)"

@@ -6628,6 +14306,36 @@ DEP_CPP_ACE_C=\
 

 SOURCE=.\SOCK.cpp

 DEP_CPP_SOCK_CP=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_SOCK_CP=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\SOCK.h"\

 	{$(INCLUDE)}"\.\ACE.h"\

 	{$(INCLUDE)}"\.\Addr.h"\

@@ -6648,6 +14356,7 @@ DEP_CPP_SOCK_CP=\
 	{$(INCLUDE)}"\.\Log_Record.i"\

 	{$(INCLUDE)}"\.\Addr.i"\

 	{$(INCLUDE)}"\.\IPC_SAP.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\SOCK.obj" : $(SOURCE) $(DEP_CPP_SOCK_CP) "$(INTDIR)"

@@ -6659,6 +14368,34 @@ DEP_CPP_SOCK_CP=\
 

 SOURCE=.\FIFO.cpp

 DEP_CPP_FIFO_C=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\FIFO.h"\

+	".\FIFO.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_FIFO_C=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\FIFO.h"\

 	{$(INCLUDE)}"\.\FIFO.i"\

 	{$(INCLUDE)}"\.\IPC_SAP.h"\

@@ -6677,6 +14414,7 @@ DEP_CPP_FIFO_C=\
 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\FIFO.obj" : $(SOURCE) $(DEP_CPP_FIFO_C) "$(INTDIR)"

@@ -6688,6 +14426,62 @@ DEP_CPP_FIFO_C=\
 

 SOURCE=.\Proactor.cpp

 DEP_CPP_PROAC=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Signal.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_PROAC=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 	{$(INCLUDE)}"\.\Proactor.h"\

 	{$(INCLUDE)}"\.\Proactor.i"\

 	{$(INCLUDE)}"\.\OS.h"\

@@ -6735,6 +14529,7 @@ DEP_CPP_PROAC=\
 	{$(INCLUDE)}"\.\Mem_Map.i"\

 	{$(INCLUDE)}"\.\Timer_Queue.i"\

 	{$(INCLUDE)}"\.\Event_Handler.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Proactor.obj" : $(SOURCE) $(DEP_CPP_PROAC) "$(INTDIR)"

@@ -6746,6 +14541,102 @@ DEP_CPP_PROAC=\
 

 SOURCE=.\ReactorEx.cpp

 DEP_CPP_REACTO=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_REACTO=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 	{$(INCLUDE)}"\.\ReactorEx.h"\

 	{$(INCLUDE)}"\.\ReactorEx.i"\

 	{$(INCLUDE)}"\.\Time_Value.h"\

@@ -6840,6 +14731,7 @@ DEP_CPP_REACTO=\
 	{$(INCLUDE)}"\.\Stack.cpp"\

 	{$(INCLUDE)}"\.\Map_Manager.i"\

 	{$(INCLUDE)}"\.\Map_Manager.cpp"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\ReactorEx.obj" : $(SOURCE) $(DEP_CPP_REACTO) "$(INTDIR)"

@@ -6851,6 +14743,104 @@ DEP_CPP_REACTO=\
 

 SOURCE=.\Token_Invariants.cpp

 DEP_CPP_TOKEN_I=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Token_Invariants.h"\

+	".\Token_Invariants.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_TOKEN_I=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 	{$(INCLUDE)}"\.\Token_Invariants.h"\

 	{$(INCLUDE)}"\.\Token_Invariants.i"\

 	{$(INCLUDE)}"\.\Synch.h"\

@@ -6947,6 +14937,7 @@ DEP_CPP_TOKEN_I=\
 	{$(INCLUDE)}"\.\Local_Tokens.i"\

 	{$(INCLUDE)}"\.\Stack.i"\

 	{$(INCLUDE)}"\.\Stack.cpp"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Token_Invariants.obj" : $(SOURCE) $(DEP_CPP_TOKEN_I) "$(INTDIR)"

@@ -6958,6 +14949,33 @@ DEP_CPP_TOKEN_I=\
 

 SOURCE=.\Process.cpp

 DEP_CPP_PROCES=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\ARGV.h"\

+	".\ARGV.i"\

+	".\config.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Process.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_PROCES=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\Process.h"\

 	{$(INCLUDE)}"\.\ARGV.h"\

 	{$(INCLUDE)}"\.\Process.i"\

@@ -6976,6 +14994,7 @@ DEP_CPP_PROCES=\
 	{$(INCLUDE)}"\.\Log_Record.i"\

 	{$(INCLUDE)}"\.\ACE.i"\

 	{$(INCLUDE)}"\.\ARGV.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Process.obj" : $(SOURCE) $(DEP_CPP_PROCES) "$(INTDIR)"

@@ -6987,6 +15006,43 @@ DEP_CPP_PROCES=\
 

 SOURCE=.\TTY_IO.cpp

 DEP_CPP_TTY_I=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\DEV.h"\

+	".\DEV.i"\

+	".\DEV_Addr.h"\

+	".\DEV_Addr.i"\

+	".\DEV_Connector.h"\

+	".\DEV_Connector.i"\

+	".\DEV_IO.h"\

+	".\DEV_IO.i"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	".\TTY_IO.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_TTY_I=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\TTY_IO.h"\

 	{$(INCLUDE)}"\.\OS.h"\

 	{$(INCLUDE)}"\.\DEV_Addr.h"\

@@ -7014,6 +15070,7 @@ DEP_CPP_TTY_I=\
 	{$(INCLUDE)}"\.\IO_SAP.h"\

 	{$(INCLUDE)}"\.\DEV.i"\

 	{$(INCLUDE)}"\.\IO_SAP.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\TTY_IO.obj" : $(SOURCE) $(DEP_CPP_TTY_I) "$(INTDIR)"

@@ -7025,6 +15082,64 @@ DEP_CPP_TTY_I=\
 

 SOURCE=.\Activation_Queue.cpp

 DEP_CPP_ACTIV=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Activation_Queue.h"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\IO_Cntl_Msg.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Queue.cpp"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Method_Object.h"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Signal.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_ACTIV=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 	{$(INCLUDE)}"\.\Activation_Queue.h"\

 	{$(INCLUDE)}"\.\Synch.h"\

 	{$(INCLUDE)}"\.\Message_Queue.h"\

@@ -7121,6 +15236,7 @@ DEP_CPP_ACTIV=\
 	{$(INCLUDE)}"\.\Addr.i"\

 	{$(INCLUDE)}"\.\IPC_SAP.i"\

 	{$(INCLUDE)}"\.\INET_Addr.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Activation_Queue.obj" : $(SOURCE) $(DEP_CPP_ACTIV) "$(INTDIR)"

@@ -7132,6 +15248,31 @@ DEP_CPP_ACTIV=\
 

 SOURCE=.\Method_Object.cpp

 DEP_CPP_METHO=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Method_Object.h"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_METHO=\

+	".\..\STL\mutex.h"\

+=======
 	{$(INCLUDE)}"\.\Method_Object.h"\

 	{$(INCLUDE)}"\.\OS.h"\

 	{$(INCLUDE)}"\.\Time_Value.h"\

@@ -7147,6 +15288,7 @@ DEP_CPP_METHO=\
 	{$(INCLUDE)}"\.\ACE.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

 	{$(INCLUDE)}"\.\ACE.i"\

+>>>>>>> 4.8
 	

 

 "$(INTDIR)\Method_Object.obj" : $(SOURCE) $(DEP_CPP_METHO) "$(INTDIR)"

@@ -7158,9 +15300,28 @@ DEP_CPP_METHO=\
 

 SOURCE=.\Registry.cpp

 DEP_CPP_REGIS=\

-	{$(INCLUDE)}"\.\Registry.h"\

-	{$(INCLUDE)}"\.\OS.h"\

 	".\..\STL\bstring.h"\

+<<<<<<< ace.mak
+	".\ACE.h"\

+	".\ACE.i"\

+	".\config.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Registry.h"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+=======
 	{$(INCLUDE)}"\.\Time_Value.h"\

 	{$(INCLUDE)}"\.\stdcpp.h"\

 	{$(INCLUDE)}"\.\ws2tcpip.h"\

@@ -7174,6 +15335,7 @@ DEP_CPP_REGIS=\
 	{$(INCLUDE)}"\.\ACE.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

 	{$(INCLUDE)}"\.\ACE.i"\

+>>>>>>> 4.8
 	

 NODEP_CPP_REGIS=\

 	".\..\STL\mutex.h"\

@@ -7187,7 +15349,124 @@ NODEP_CPP_REGIS=\
 # Begin Source File

 

 SOURCE=.\Task.cpp

+<<<<<<< ace.mak
+

+!IF  "$(CFG)" == "ace - Win32 Release"

+

+=======
+>>>>>>> 4.8
 DEP_CPP_TASK_=\

+<<<<<<< ace.mak
+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Queue.cpp"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_TASK_=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

+=======
 	{$(INCLUDE)}"\.\Task.h"\

 	{$(INCLUDE)}"\.\Module.h"\

 	{$(INCLUDE)}"\.\Service_Config.h"\

@@ -7293,11 +15572,132 @@ DEP_CPP_TASK_=\
 	{$(INCLUDE)}"\.\Addr.i"\

 	{$(INCLUDE)}"\.\IPC_SAP.i"\

 	{$(INCLUDE)}"\.\INET_Addr.i"\

+>>>>>>> 4.8
+	

+

+"$(INTDIR)\Task.obj" : $(SOURCE) $(DEP_CPP_TASK_) "$(INTDIR)"

+

+

+<<<<<<< ace.mak
+!ELSEIF  "$(CFG)" == "ace - Win32 Debug"

+

+DEP_CPP_TASK_=\

+	".\..\STL\bstring.h"\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.i"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Queue.cpp"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\ReactorEx.h"\

+	".\ReactorEx.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Set.cpp"\

+	".\Set.h"\

+	".\Set.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\Stack.cpp"\

+	".\Stack.h"\

+	".\Stack.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Time_Value.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	{$(INCLUDE)}"\MALLOC.H"\

+	{$(INCLUDE)}"\PROCESS.H"\

+	{$(INCLUDE)}"\SIGNAL.H"\

+	{$(INCLUDE)}"\sys\STAT.H"\

+	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\sys\TYPES.H"\

+	

+NODEP_CPP_TASK_=\

+	".\..\STL\mutex.h"\

+	".\ace\Sync_T.h"\

 	

 

 "$(INTDIR)\Task.obj" : $(SOURCE) $(DEP_CPP_TASK_) "$(INTDIR)"

 

 

+!ENDIF 

+=======
 # End Source File

 ################################################################################

 # Begin Source File

@@ -7400,6 +15800,7 @@ DEP_CPP_STRAT=\
 

 "$(INTDIR)\Strategies.obj" : $(SOURCE) $(DEP_CPP_STRAT) "$(INTDIR)"

 

+>>>>>>> 4.8
 

 # End Source File

 # End Target

diff --git a/ace/ace.mdp b/ace/ace.mdp
index 984edd9f516..6c5e4138047 100644
--- a/ace/ace.mdp
+++ b/ace/ace.mdp
diff --git a/ace/config-win32-msvc4.0.h b/ace/config-win32-msvc4.0.h
index 5f6c27ad6cb..38bbb5eeb2d 100644
--- a/ace/config-win32-msvc4.0.h
+++ b/ace/config-win32-msvc4.0.h
@@ -76,7 +76,6 @@
 // Define the following macro if you're compiling with WinSock 2.0.
 // #define ACE_HAS_WINSOCK2
 
-// Needed for timeval.
 #if defined (ACE_HAS_WINSOCK2)
 #if !defined (_WINSOCK2API_)
 #include /**/ <winsock2.h>		// will also include windows.h, if not present