Changes to fix slight typo's when adding new RB_Tree compatibility.

4 files changed, 19 insertions, 26 deletions

diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_headers.cpp b/apps/JAWS/PROTOTYPE/HTTPU/http_headers.cpp
index d4bde38d40e..9c00c783554 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/http_headers.cpp
+++ b/apps/JAWS/PROTOTYPE/HTTPU/http_headers.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "ace/RB_Tree.h"
 #include "HTTPU/http_headers.h"
 
 HTTP_Hdr_Node
@@ -75,6 +76,11 @@ HTTP_Hdr_Node
 const int &HTTP_HCodes::NUM_HEADER_STRINGS
   = HTTP_Header_Nodes_Singleton::instance ()->num_header_strings_;
 
+HTTP_Header_Nodes::HTTP_Header_Nodes (void)
+  : num_header_strings_ (0)
+{
+}
+
 HTTP_Hdr_Node::HTTP_Hdr_Node (const char *token, const char *format)
   : token_ (token),
     format_ (format)
@@ -87,6 +93,15 @@ HTTP_Hdr_Node::HTTP_Hdr_Node (const char *token, const char *format)
   header_nodes->num_header_strings_++;
 }
 
+HTTP_HCodes::HTTP_HCodes (void)
+  : header_nodes_ (HTTP_Header_Nodes_Singleton::instance ())
+{
+}
+
+HTTP_Headers::HTTP_Headers (void)
+{
+}
+
 const char *
 HTTP_Headers::header (int name) const
 {
@@ -130,15 +145,11 @@ HTTP_Headers::value_reset (void)
 
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Const_Binary_Functor_Base<int, int>;
-template class ACE_Less_Than_Functor<int, int>;
 template class ACE_RB_Tree<int, const HTTP_Hdr_Node *, ACE_Less_Than<int>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Node<int, const HTTP_Hdr_Node *>;
 template class ACE_RB_Tree_Iterator<int, const HTTP_Hdr_Node *, ACE_Less_Than<int>, ACE_Null_Mutex>;
 template class ACE_Singleton<HTTP_Header_Nodes, ACE_SYNCH_MUTEX>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Const_Binary_Functor_Base<int, int>
-#pragma instantiate ACE_Less_Than_Functor<int, int>
 #pragma instantiate ACE_RB_Tree<int, const HTTP_Hdr_Node *, ACE_Less_Than<int>, ACE_Null_Mutex>
 #pragma instantiate ACE_RB_Tree_Node<int, const HTTP_Hdr_Node *>
 #pragma instantiate ACE_RB_Tree_Iterator<int, const HTTP_Hdr_Node *, ACE_Less_Than<int>, ACE_Null_Mutex>
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_headers.i b/apps/JAWS/PROTOTYPE/HTTPU/http_headers.i
index e18a7d9064b..73ea46e57b6 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/http_headers.i
+++ b/apps/JAWS/PROTOTYPE/HTTPU/http_headers.i
@@ -24,18 +24,6 @@ HTTP_Hdr_Node::format (void) const
   return this->format_;
 }
 
-ACE_INLINE
-HTTP_Header_Nodes::HTTP_Header_Nodes (void)
-  : num_header_strings_ (0)
-{
-}
-
-ACE_INLINE
-HTTP_HCodes::HTTP_HCodes (void)
-  : header_nodes_ (HTTP_Header_Nodes_Singleton::instance ())
-{
-}
-
 ACE_INLINE const HTTP_Hdr_Node &
 HTTP_HCodes::hcode (int type) const
 {
@@ -45,11 +33,6 @@ HTTP_HCodes::hcode (int type) const
   return **hn;
 }
 
-ACE_INLINE
-HTTP_Headers::HTTP_Headers (void)
-{
-}
-
 ACE_INLINE const char *
 HTTP_Headers::header_token (int name) const
 {
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_status.cpp b/apps/JAWS/PROTOTYPE/HTTPU/http_status.cpp
index ae97d2f7fa0..07009659fb7 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/http_status.cpp
+++ b/apps/JAWS/PROTOTYPE/HTTPU/http_status.cpp
@@ -71,6 +71,10 @@ HTTP_SCode::HTTP_SCode (void)
     }
 }
 
+HTTP_SCode::~HTTP_SCode (void)
+{
+}
+
 #if !defined (ACE_HAS_INLINED_OSCALLS)
 #   include "HTTPU/http_status.i"
 # endif /* ACE_HAS_INLINED_OSCALLS */
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_status.i b/apps/JAWS/PROTOTYPE/HTTPU/http_status.i
index 6af946c39a7..0247ddeb738 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/http_status.i
+++ b/apps/JAWS/PROTOTYPE/HTTPU/http_status.i
@@ -17,8 +17,3 @@ HTTP_SCode_Node::operator const char * (void) const
 {
   return this->code_str_;
 }
-
-ACE_INLINE
-HTTP_SCode::~HTTP_SCode (void)
-{
-}