[Boost-commit] svn:boost r45555 - sandbox/SOC/2007/cgi/trunk/boost/cgi/common

From: lists.drrngrvy_at_[hidden]
Date: 2008-05-19 15:06:45

Author: drrngrvy
Date: 2008-05-19 15:06:45 EDT (Mon, 19 May 2008)
New Revision: 45555
URL: http://svn.boost.org/trac/boost/changeset/45555

Log:
Fix name.hpp
Text files modified: 
   sandbox/SOC/2007/cgi/trunk/boost/cgi/common/name.hpp |    33 +++++++++++++++++----------------       
   1 files changed, 17 insertions(+), 16 deletions(-)

Modified: sandbox/SOC/2007/cgi/trunk/boost/cgi/common/name.hpp
==============================================================================
--- sandbox/SOC/2007/cgi/trunk/boost/cgi/common/name.hpp	(original)
+++ sandbox/SOC/2007/cgi/trunk/boost/cgi/common/name.hpp	2008-05-19 15:06:45 EDT (Mon, 19 May 2008)
@@ -15,7 +15,8 @@
 
 #include <string>
 #include <ostream>
-#include <map>
+#include <cstdlib>
+#include <ctype.h>
 
 namespace cgi {
  namespace common {
@@ -25,13 +26,13 @@
      : std::char_traits<CharT>
    {
      static bool eq(char c1, char c2)
-     { return std::toupper(c1) == std::toupper(c2); }
+     { return toupper(c1) == toupper(c2); }
 
      static bool ne(char c1, char c2)
-     { return std::toupper(c1) != std::toupper(c2); }
+     { return toupper(c1) != toupper(c2); }
 
      static bool lt(char c1, char c2)
-     { return std::toupper(c1) < std::toupper(c2); }
+     { return toupper(c1) < toupper(c2); }
 
      static int compare( const char* str1
                        , const char* str2
@@ -39,8 +40,8 @@
      {
        if (num)
          do {
-           if (std::toupper(*str1) != std::toupper(*str2))
-             return (std::toupper(*str1) - std::toupper(*str2));
+           if (toupper(*str1) != toupper(*str2))
+             return (toupper(*str1) - toupper(*str2));
            ++str1;
            ++str2;
          } while (--num);
@@ -52,7 +53,7 @@
        find(const char* str, int n, char a)
      {
        do {
-         std::toupper(*str) != std::toupper(a);
+         toupper(*str) != toupper(a);
          ++str;
        } while (--n);
        return str;
@@ -63,17 +64,17 @@
    // typedef for typical usage.
    typedef std::basic_string<char, ichar_traits<char> > name;
 
-   // Overload allowing output using standard streams.
-   template <typename CharT, typename Traits>
-   std::basic_ostream<CharT, Traits>&
-     operator<< (std::basic_ostream<CharT, Traits>& os
-                , const std::basic_string<CharT, ichar_traits<CharT> >& str)
-   {
-     return os<< str.c_str();
-   } 
-
  } // namespace common
 } // namespace cgi
 
+// Allow output using standard streams (conserves original case).
+template <typename CharT, typename Traits>
+std::basic_ostream<CharT, Traits>&
+  operator<< (std::basic_ostream<CharT, Traits>& os
+             , const std::basic_string<CharT, ichar_traits<CharT> >& str)
+{
+  return os<< str.c_str();
+} 
+
 #endif // BOOST_CGI_COMMON_NAME_HPP_INCLUDED__