[complement-svn] SF.net SVN: complement:[1970] trunk/complement/explore

[<com...@us...>]

Revision: 1970
          http://complement.svn.sourceforge.net/complement/?rev=1970&view=rev
Author:   complement
Date:     2008-10-13 10:33:59 +0000 (Mon, 13 Oct 2008)

Log Message:
-----------
use full qualification for namespace, due to possible ambiguity.

std::detail and ::detail in use, so ambiguity is possible.

Modified Paths:
--------------
    trunk/complement/explore/include/sockios/sockstream
    trunk/complement/explore/lib/misc/opts.cc
    trunk/complement/explore/lib/mt/system_error.cc

Modified: trunk/complement/explore/include/sockios/sockstream
===================================================================
--- trunk/complement/explore/include/sockios/sockstream	2008-10-13 10:33:10 UTC (rev 1969)
+++ trunk/complement/explore/include/sockios/sockstream	2008-10-13 10:33:59 UTC (rev 1970)
@@ -1,4 +1,4 @@
-// -*- C++ -*- Time-stamp: <08/07/01 14:46:29 yeti>
+// -*- C++ -*- Time-stamp: <08/10/01 00:27:31 ptr>
 
 /*
  * Copyright (c) 1997-1999, 2002, 2003, 2005-2008
@@ -288,7 +288,7 @@
     bool _use_wrtimeout;
     bool _notify_close;
 
-    static detail::sockmgr<charT,traits,_Alloc>* mgr;
+    static std::detail::sockmgr<charT,traits,_Alloc>* mgr;
     friend class Init;
 };
 
@@ -306,7 +306,7 @@
   if ( direction ) {
     std::tr2::lock_guard<std::tr2::mutex> lk( _init_lock );
     if ( _count++ == 0 ) {
-      basic_socket<charT,traits,_Alloc>::mgr = new detail::sockmgr<charT,traits,_Alloc>();
+      basic_socket<charT,traits,_Alloc>::mgr = new std::detail::sockmgr<charT,traits,_Alloc>();
 #ifdef __FIT_PTHREADS
       if ( !_at_fork ) { // call only once
         if ( pthread_atfork( __at_fork_prepare, __at_fork_parent, __at_fork_child ) ) {
@@ -343,7 +343,7 @@
     // stop mgr
     _count = 1;
     delete basic_socket<charT,traits,_Alloc>::mgr;
-    basic_socket<charT,traits,_Alloc>::mgr = new detail::sockmgr<charT,traits,_Alloc>();
+    basic_socket<charT,traits,_Alloc>::mgr = new std::detail::sockmgr<charT,traits,_Alloc>();
   }
   // _sock_processor_base::_idx =  std::tr2::this_thread::xalloc();
 }
@@ -356,7 +356,7 @@
 char basic_socket<charT,traits,_Alloc>::Init_buf[128];
 
 template <class charT, class traits, class _Alloc>
-detail::sockmgr<charT,traits,_Alloc>* basic_socket<charT,traits,_Alloc>::mgr = 0;
+std::detail::sockmgr<charT,traits,_Alloc>* basic_socket<charT,traits,_Alloc>::mgr = 0;
 
 #ifdef STLPORT
 _STLP_END_NAMESPACE
@@ -620,7 +620,7 @@
     std::tr2::mutex ulck;
     std::tr2::condition_variable ucnd;
 
-    friend class detail::sockmgr<charT,traits,_Alloc>;
+    friend class std::detail::sockmgr<charT,traits,_Alloc>;
     friend class sock_processor_base<charT,traits,_Alloc>;
 };
 

Modified: trunk/complement/explore/lib/misc/opts.cc
===================================================================
--- trunk/complement/explore/lib/misc/opts.cc	2008-10-13 10:33:10 UTC (rev 1969)
+++ trunk/complement/explore/lib/misc/opts.cc	2008-10-13 10:33:59 UTC (rev 1970)
@@ -1,4 +1,4 @@
-// -*- C++ -*- Time-stamp: <08/06/29 22:38:24 ptr>
+// -*- C++ -*- Time-stamp: <08/10/01 10:12:43 ptr>
 
 /*
  * Copyright (c) 2008
@@ -71,7 +71,7 @@
 {
   options_container_type::const_iterator i = 
     std::find_if( storage.begin(), storage.end(),
-                  std::bind2nd( detail::deref_equal<option_base*,char>(), field ) );
+                  std::bind2nd( ::detail::deref_equal<option_base*,char>(), field ) );
 
   return ( (i == storage.end()) ? false : !(*i)->pos.empty());
 }
@@ -80,7 +80,7 @@
 {
   options_container_type::const_iterator i = 
     std::find_if( storage.begin(), storage.end(),
-                  std::bind2nd( detail::deref_equal<option_base*,std::string>(), field ) );
+                  std::bind2nd( ::detail::deref_equal<option_base*,std::string>(), field ) );
 
   return ( (i == storage.end()) ? false : !(*i)->pos.empty());
 }
@@ -89,7 +89,7 @@
 {
   options_container_type::const_iterator i = 
     std::find_if( storage.begin(), storage.end(),
-                  std::bind2nd( detail::deref_equal<option_base*,int>(), field ) );
+                  std::bind2nd( ::detail::deref_equal<option_base*,int>(), field ) );
 
   return ( (i == storage.end()) ? false : !(*i)->pos.empty());
 }
@@ -98,7 +98,7 @@
 {
   options_container_type::const_iterator i = 
     std::find_if( storage.begin(), storage.end(),
-                  std::bind2nd( detail::deref_equal<option_base*,char>(), field ) );
+                  std::bind2nd( ::detail::deref_equal<option_base*,char>(), field ) );
 
   return ( (i == storage.end()) ? 0 : (*i)->pos.size());
 }
@@ -107,7 +107,7 @@
 {
   options_container_type::const_iterator i = 
     std::find_if( storage.begin(), storage.end(),
-                  std::bind2nd( detail::deref_equal<option_base*,std::string>(), field ) );
+                  std::bind2nd( ::detail::deref_equal<option_base*,std::string>(), field ) );
 
   return ( (i == storage.end()) ? 0 : (*i)->pos.size());
 }
@@ -116,7 +116,7 @@
 {
   options_container_type::const_iterator i = 
     std::find_if( storage.begin(), storage.end(),
-                  std::bind2nd( detail::deref_equal<option_base*,int>(), field ) );
+                  std::bind2nd( ::detail::deref_equal<option_base*,int>(), field ) );
 
   return ( (i == storage.end()) ? 0 : (*i)->pos.size());
 }

Modified: trunk/complement/explore/lib/mt/system_error.cc
===================================================================
--- trunk/complement/explore/lib/mt/system_error.cc	2008-10-13 10:33:10 UTC (rev 1969)
+++ trunk/complement/explore/lib/mt/system_error.cc	2008-10-13 10:33:59 UTC (rev 1970)
@@ -1,4 +1,4 @@
-// -*- C++ -*- Time-stamp: <08/07/25 10:04:45 ptr>
+// -*- C++ -*- Time-stamp: <08/10/01 00:22:12 ptr>
 
 /*
  * Copyright (c) 2007-2008
@@ -900,17 +900,17 @@
 
 const error_category& get_posix_category()
 {
-  return detail::_posix_error_category;
+  return ::detail::_posix_error_category;
 }
 
 const error_category& get_system_category()
 {
-  return detail::_system_error_category;
+  return ::detail::_system_error_category;
 }
 
 error_code::error_code() :
     v( 0 ),
-    c( &detail::_system_error_category )
+    c( &::detail::_system_error_category )
 { }
 
 error_code::error_code( int val, const error_category& cat ) :
@@ -927,16 +927,16 @@
 void error_code::clear()
 {
   v = 0;
-  c = &detail::_system_error_category;
+  c = &::detail::_system_error_category;
 }
 
 namespace posix_error {
 
 error_code make_error_code( posix_errno err )
-{ return error_code( err, detail::_posix_error_category ); }
+{ return error_code( err, ::detail::_posix_error_category ); }
 
 error_condition make_error_condition( posix_errno err )
-{ return error_condition( err, detail::_posix_error_category ); }
+{ return error_condition( err, ::detail::_posix_error_category ); }
 
 } // namespace posix_error
 
@@ -947,7 +947,7 @@
 
 error_condition::error_condition() :
     v( 0 ),
-    c( &detail::_posix_error_category )
+    c( &::detail::_posix_error_category )
 { }
 
 error_condition::error_condition( int val, const error_category& cat ) :
@@ -964,7 +964,7 @@
 void error_condition::clear()
 {
   v = 0;
-  c = &detail::_posix_error_category;
+  c = &::detail::_posix_error_category;
 }
 
 bool operator <( const error_condition& l, const error_condition& r )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.