Tue Jan 9 11:21:30 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

8 files changed, 29 insertions, 69 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index b294489fffd..d351e2cd6f6 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,21 @@
+Tue Jan  9 11:21:30 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/String_Base.cpp:
+        * ace/String_Base.h:
+          Moved the members of String_Base_Const to String_Base and
+          removed String_Base_Const
+
+        * ace/String_Base_Const.cpp:
+        * ace/String_Base_Const.h:
+          Remove String_Base_Const. It was there as workaround for an old
+          sun compiler which we don't support anymore. Fixes bugzilla bug
+          2588.
+
+        * ace/ace.mpc:
+        * ace/ace_for_tao.mpc:
+        * ace/Makefile.am:
+          Removed String_Base_Const.{h,cpp}
+
 Tue Jan  9 09:11:44 UTC 2007  Krishnakumar B  <kitty@dre.vanderbilt.edu>
 
         * docs/svn/config (enable-auto-props):
diff --git a/ACE/ace/Makefile.am b/ACE/ace/Makefile.am
index 955b88be851..61c8ab39cc1 100644
--- a/ACE/ace/Makefile.am
+++ b/ACE/ace/Makefile.am
@@ -286,7 +286,6 @@ libACE_la_SOURCES = \
   Signal.cpp \
   Sock_Connect.cpp \
   Stats.cpp \
-  String_Base_Const.cpp \
   Svc_Conf_Lexer.cpp \
   Svc_Conf_y.cpp \
   Synch_Options.cpp \
@@ -964,7 +963,6 @@ nobase_include_HEADERS += \
   String_Base.cpp \
   String_Base.h \
   String_Base.inl \
-  String_Base_Const.h \
   Svc_Conf.h \
   Svc_Conf_Lexer.h \
   Svc_Conf_Tokens.h \
diff --git a/ACE/ace/String_Base.cpp b/ACE/ace/String_Base.cpp
index 525dcbc2553..a8425518edc 100644
--- a/ACE/ace/String_Base.cpp
+++ b/ACE/ace/String_Base.cpp
@@ -8,6 +8,7 @@
 #include "ace/String_Base.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_string.h"
+#include "ace/Numeric_Limits.h"
 
 #include <algorithm>  // For std::swap<>
 
@@ -20,6 +21,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_String_Base)
 
 template <class CHAR>
+ACE_String_Base<CHAR>::size_type const ACE_String_Base<CHAR>::npos =
+  ACE_Numeric_Limits<ACE_String_Base<CHAR>::size_type>::max ();
+
+template <class CHAR>
 CHAR ACE_String_Base<CHAR>::NULL_String_ = 0;
 
 // Default constructor.
diff --git a/ACE/ace/String_Base.h b/ACE/ace/String_Base.h
index 239019b0fae..a2c6e4009f4 100644
--- a/ACE/ace/String_Base.h
+++ b/ACE/ace/String_Base.h
@@ -22,7 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/String_Base_Const.h"
+#include "ace/Malloc_Base.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -55,11 +55,14 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  *     probably doing something wrong.
  */
 template <class CHAR>
-class ACE_String_Base : public ACE_String_Base_Const
+class ACE_String_Base
 {
 public:
+  typedef ACE_Allocator::size_type size_type;
 
-  using ACE_String_Base_Const::size_type;
+  /// Constant that denotes case where no such character position
+  /// exists.
+  static size_type const npos;
 
    /**
     *  Default constructor.
diff --git a/ACE/ace/String_Base_Const.cpp b/ACE/ace/String_Base_Const.cpp
deleted file mode 100644
index 77dff6db428..00000000000
--- a/ACE/ace/String_Base_Const.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-
-#include "ace/String_Base_Const.h"
-#include "ace/Numeric_Limits.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_String_Base_Const::size_type const ACE_String_Base_Const::npos =
-  ACE_Numeric_Limits<ACE_String_Base_Const::size_type>::max ();
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/String_Base_Const.h b/ACE/ace/String_Base_Const.h
deleted file mode 100644
index a3aceaaed6c..00000000000
--- a/ACE/ace/String_Base_Const.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    String_Base_Const.h
- *
- *  $Id$
- *
- *  @author Nanbor Wang <nanbor@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef ACE_STRING_BASE_CONST_H
-#define ACE_STRING_BASE_CONST_H
-
-#include /**/ "ace/pre.h"
-
-#include /**/ "ace/ACE_export.h"
-#include "ace/Malloc_Base.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class ACE_String_Base_Const
- *
- * @brief This class defines a constant for ACE_String_Base to
- *        circumvent a bug in SunCC 6.0.
- */
-class ACE_Export ACE_String_Base_Const
-{
-public:
-
-  typedef ACE_Allocator::size_type size_type;
-
-  /// Constant that denotes case where no such character position
-  /// exists.
-  static size_type const npos;
-
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-#endif /* ACE_STRING_BASE_CONST_H */
diff --git a/ACE/ace/ace.mpc b/ACE/ace/ace.mpc
index 4b6aca6fd21..ab12ad72dc6 100644
--- a/ACE/ace/ace.mpc
+++ b/ACE/ace/ace.mpc
@@ -229,7 +229,6 @@ project(ACE) : acedefaults, install, other, codecs, token, svcconf, uuid, fileca
     SPIPE_Stream.cpp
     SString.cpp
     Stats.cpp
-    String_Base_Const.cpp
     SUN_Proactor.cpp
     SV_Message.cpp
     SV_Message_Queue.cpp
@@ -413,7 +412,6 @@ project(ACE) : acedefaults, install, other, codecs, token, svcconf, uuid, fileca
     SStringfwd.h
     Static_Object_Lock.h
     Strategies.h
-    String_Base_Const.h
     Svc_Conf.h
     Svc_Conf_Tokens.h
     Swap.h
diff --git a/ACE/ace/ace_for_tao.mpc b/ACE/ace/ace_for_tao.mpc
index 58b7a928fe5..368a3109259 100644
--- a/ACE/ace/ace_for_tao.mpc
+++ b/ACE/ace/ace_for_tao.mpc
@@ -162,7 +162,6 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace,
     SPIPE_Stream.cpp
     SString.cpp
     Stats.cpp            // Required by orbsvcs/tests/Notify
-    String_Base_Const.cpp
     Synch_Options.cpp
     Task.cpp
     Thread.cpp
@@ -331,7 +330,6 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace,
     SStringfwd.h
     Static_Object_Lock.h
     Strategies.h
-    String_Base_Const.h
     Svc_Conf.h
     Svc_Conf_Tokens.h
     Swap.h