Index: src/logstream.cpp
===================================================================
--- src/logstream.cpp	(revision 420994)
+++ src/logstream.cpp	(working copy)
@@ -19,7 +19,7 @@
 #include <log4cxx/helpers/transcoder.h>
 
 #if LOG4CXX_HAS_WCHAR_T
-log4cxx::logstream& operator<<(
+log4cxx::logstream& log4cxx::operator<<(
   ::log4cxx::logstream& lhs,
   const char* rhs) {
   LOG4CXX_DECODE_CHAR(tmp, rhs);
@@ -28,7 +28,7 @@
   return lhs;
 }
 #else
-log4cxx::logstream& operator<<(
+log4cxx::logstream& log4cxx::operator<<(
   ::log4cxx::logstream& lhs,
   const char* rhs) {
   LOG4CXX_DECODE_CHAR(tmp, rhs);
@@ -39,7 +39,7 @@
 #endif
 
 #if LOG4CXX_HAS_WCHAR_T
-log4cxx::logstream& operator<<(
+log4cxx::logstream& log4cxx::operator<<(
   ::log4cxx::logstream& lhs,
   const ::log4cxx::LogString& rhs) {
   LOG4CXX_DECODE_CHAR(tmp, rhs);
@@ -48,7 +48,7 @@
   return lhs;
 }
 #else
-log4cxx::logstream& operator<<(
+log4cxx::logstream& log4cxx::operator<<(
   ::log4cxx::logstream& lhs,
   const ::log4cxx::LogString& rhs) {
   LOG4CXX_DECODE_CHAR(tmp, rhs);
@@ -58,7 +58,7 @@
 }
 #endif
 
-::log4cxx::logstream& operator<<(
+::log4cxx::logstream& log4cxx::operator<<(
    ::log4cxx::logstream& lhs,
    const ::log4cxx::spi::LocationInfo& rhs) {
    lhs.setLocation(rhs);
@@ -66,14 +66,14 @@
 }
 
 
-::log4cxx::logstream& operator<<(
+::log4cxx::logstream& log4cxx::operator<<(
    ::log4cxx::logstream& lhs,
    const ::log4cxx::spi::LocationFlush& rhs) {
    lhs.flush(rhs);
    return lhs;
 }
 
-::log4cxx::logstream& operator<<(
+::log4cxx::logstream& log4cxx::operator<<(
    ::log4cxx::logstream& lhs,
    const ::log4cxx::LevelPtr& rhs) {
    lhs.setLevel(rhs);
@@ -81,7 +81,7 @@
 }
 
 
-::log4cxx::logstream& operator<<(
+::log4cxx::logstream& log4cxx::operator<<(
    ::log4cxx::logstream& lhs,
    ::std::ios_base& (*manip)(::std::ios_base&)) {
      (*manip)(lhs);
Index: include/log4cxx/stream.h
===================================================================
--- include/log4cxx/stream.h	(revision 420994)
+++ include/log4cxx/stream.h	(working copy)
@@ -144,7 +144,6 @@
 
         };
 
-}  // namespace log4cxx
 
 
 LOG4CXX_EXPORT ::log4cxx::logstream& operator<<(
@@ -189,6 +188,7 @@
    return lhs;
 }
 
+}  // namespace log4cxx
 
 #if !defined(LOG4CXX_ENDMSG)
 #define LOG4CXX_ENDMSG LOG4CXX_LOCATION_FLUSH