Partially fixed a bug in the test suite that led to test runs randomly failing.

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

diff --git a/threaded_log.h b/threaded_log.h
index 750c5d2..6630a86 100644 (file)
--- a/threaded_log.h
+++ b/threaded_log.h
@@ -19,7 +19,7 @@ namespace std {
 }
 
 template <class A>
 }
 
 template <class A>

-typename enable_if<is_iterable<A>::value && !is_same<A,string>::value, ostream>::type &
+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, ", ") << "]";
 }
 operator<<(ostream &o, const A &a) {
     return o << "[" << implode(a, ", ") << "]";
 }

@@ -38,7 +38,7 @@ operator<<(ostream &o, const A &a) {
     int _self_ = instance_name_map[this]; \
     if (_self_==0) \
         _self_ = instance_name_map[this] = ++next_instance_num; \
     int _self_ = instance_name_map[this]; \
     if (_self_==0) \
         _self_ = instance_name_map[this] = ++next_instance_num; \

-    cerr << "#" << setw(2) << " " << _self_; \
+    cerr << "#" << left << setw(2) << _self_ << " "; \

 }
 
 #define LOG_NONMEMBER(_x_) { \
 }
 
 #define LOG_NONMEMBER(_x_) { \