Clean-ups and fixes to compile with more warnings enabled and with g++.

[invirt/third/libt4.git] / threaded_log.h

diff --git a/threaded_log.h b/threaded_log.h
index 903b0fa..bccd813 100644 (file)
--- a/threaded_log.h
+++ b/threaded_log.h
@@ -10,20 +10,6 @@ extern map<void *, int> instance_name_map;
 extern int next_instance_num;
 extern char log_thread_prefix;
 
 extern int next_instance_num;
 extern char log_thread_prefix;
 

-namespace std {
-    // Sticking this in std:: makes it possible for ostream_iterator to use it.
-    template <class A, class B>
-    ostream & operator<<(ostream & o, const pair<A,B> & d) {
-        return o << "<" << d.first << "," << d.second << ">";
-    }
-}
-
-template <class A>
-typename enable_if<is_const_iterable<A>::value && !is_same<A,string>::value, ostream>::type &
-operator<<(ostream & o, const A & a) {
-    return o << "[" << implode(a, ", ") << "]";
-}
-

 #define LOG_PREFIX { \
     auto _thread_ = this_thread::get_id(); \
     int _tid_ = thread_name_map[_thread_]; \
 #define LOG_PREFIX { \
     auto _thread_ = this_thread::get_id(); \
     int _tid_ = thread_name_map[_thread_]; \