Importing some more changes from HEAD and fixing a build

3 files changed, 1 insertions, 103 deletions

diff --git a/TAO/tao/Transport_Selection_Guard.cpp b/TAO/tao/Transport_Selection_Guard.cpp
index d5dfa0c6613..41bad9ab58a 100644
--- a/TAO/tao/Transport_Selection_Guard.cpp
+++ b/TAO/tao/Transport_Selection_Guard.cpp
@@ -64,88 +64,7 @@ namespace TAO
 
 
   /// Dtor
-  Transport_Selection_Guard::~Transport_Selection_Guard (void)
-  {
-
-#if TAO_HAS_TRANSPORT_CURRENT == 1
-
-    TAO_TSS_Resources::instance ()->tsg_ = prev_;
-    this->prev_ = 0;
-
-#endif  /* TAO_HAS_TRANSPORT_CURRENT == 1 */
-    this->curr_ = 0;
-  };
-
-} /* namespace TAO */
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-// $Id$
-
-#include "tao/Transport_Selection_Guard.h"
-#include "tao/TSS_Resources.h"
-
-ACE_RCSID (tao,
-           Transport_Selection_Guard.cpp,
-           "$Id$")
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-
-  Transport_Selection_Guard*
-  Transport_Selection_Guard::current (TAO_ORB_Core* core, size_t tss_slot_id)
-  {
-    // @NOTE: (Iliyan) Started making this method aware of the core
-    // and the tss slot that correspond to the "current" transport,
-    // influenced by a general design preference to keep things
-    // local. The idea was to make the current TSG part of the TSS
-    // storage for a specific ORB Core, as opposed to using the global
-    // TSS Resources. However, it really doesn't offer any benefit to
-    // store a Transport pointer locally, for each ORB. There is
-    // always only one current Transport per thread. Period. The
-    // number of ORB Core instances in existence does not change that
-    // fact, so keeping a separate pointer would have been an
-    // over-kill.
-    ACE_UNUSED_ARG (core);
-    ACE_UNUSED_ARG (tss_slot_id);
-
-#if TAO_HAS_TRANSPORT_CURRENT == 1
-
-    return TAO_TSS_Resources::instance ()->tsg_;
-
-#else  /* TAO_HAS_TRANSPORT_CURRENT != 1 */
-
-    return 0;
-
-#endif  /* TAO_HAS_TRANSPORT_CURRENT == 1 */
-  };
-
-
-
-  /// Ctor
-  Transport_Selection_Guard::Transport_Selection_Guard (TAO_Transport* t)
-    :
-#if TAO_HAS_TRANSPORT_CURRENT == 1
-
-    prev_ (TAO_TSS_Resources::instance ()->tsg_)
-    ,
-
-#endif  /* TAO_HAS_TRANSPORT_CURRENT == 1 */
-    curr_ (t)
-  {
-#if TAO_HAS_TRANSPORT_CURRENT == 1
-
-    TAO_TSS_Resources::instance ()->tsg_ = this;
-
-#endif  /* TAO_HAS_TRANSPORT_CURRENT == 1 */
-
-  };
-
-
-
-  /// Dtor
-  Transport_Selection_Guard::~Transport_Selection_Guard (void)
+  Transport_Selection_Guard::~Transport_Selection_Guard ()
   {
 
 #if TAO_HAS_TRANSPORT_CURRENT == 1
diff --git a/ace/os_include/os_netdb.h b/ace/os_include/os_netdb.h
index 879aecd1c69..e69a3c78cf0 100644
--- a/ace/os_include/os_netdb.h
+++ b/ace/os_include/os_netdb.h
@@ -49,19 +49,6 @@ extern "C"
 {
 #endif /* __cplusplus */
 
-<<<<<<< .working
-#if defined (ACE_LACKS_HOSTENT)
-struct  hostent {
-        char    *h_name;        /* official name of host */
-        char    **h_aliases;    /* alias list */
-        int     h_addrtype;     /* host address type */
-        int     h_length;       /* length of address */
-        char    **h_addr_list;  /* list of addresses from name server */
-#define h_addr  h_addr_list[0]  /* address, for backward compatibility */
-};
-#endif /* ACE_LACKS_HOSTENT */
-
-=======
 #if defined (ACE_LACKS_HOSTENT)
 struct  hostent {
         char    *h_name;        /* official name of host */
@@ -90,7 +77,6 @@ struct  servent {
 };
 #endif /* ACE_LACKS_SERVENT */
 
->>>>>>> .merge-right.r75022
 #if defined (ACE_HAS_STRUCT_NETDB_DATA)
    typedef char ACE_HOSTENT_DATA[sizeof(struct hostent_data)];
    typedef char ACE_SERVENT_DATA[sizeof(struct servent_data)];
diff --git a/bin/MakeProjectCreator/config/tc.mpb b/bin/MakeProjectCreator/config/tc.mpb
index 34ac31dff72..fc9efc8b653 100644
--- a/bin/MakeProjectCreator/config/tc.mpb
+++ b/bin/MakeProjectCreator/config/tc.mpb
@@ -5,10 +5,3 @@ project {
   after   += TC
   libs    += TAO_TC
 }
-// -*- MPC -*-
-// $Id$
-
-project {
-  after   += TC
-  libs    += TAO_TC
-}