[Swift-commit] cog r3959

[swift at ci.uchicago.edu]

------------------------------------------------------------------------
r3959 | timgarmstrong | 2014-06-24 16:16:43 -0500 (Tue, 24 Jun 2014) | 1 line

For some reason probably due to overload resolution this fixes log lock deadlock issue
------------------------------------------------------------------------
Index: modules/provider-coaster-c-client/src/Logger.cpp
===================================================================
--- modules/provider-coaster-c-client/src/Logger.cpp	(revision 3958)
+++ modules/provider-coaster-c-client/src/Logger.cpp	(working copy)
@@ -52,7 +52,7 @@
 	}
 }
 
-Logger& Logger::operator<< (string& str) {
+Logger& Logger::operator<< (const string& str) {
 	header();
 	if (level >= threshold) {
 		buffer << str;
Index: modules/provider-coaster-c-client/src/Lock.cpp
===================================================================
--- modules/provider-coaster-c-client/src/Lock.cpp	(revision 3958)
+++ modules/provider-coaster-c-client/src/Lock.cpp	(working copy)
@@ -11,8 +11,8 @@
 
 static int unique = 0;
 
-#define DEBUG_LOCKS 1
-#define DEBUG_LOCKS_STACKS 1
+#define DEBUG_LOCKS 0
+#define DEBUG_LOCKS_STACKS 0
 
 #if DEBUG_LOCKS_STACKS == 1
 #include <execinfo.h>
Index: modules/provider-coaster-c-client/src/Logger.h
===================================================================
--- modules/provider-coaster-c-client/src/Logger.h	(revision 3958)
+++ modules/provider-coaster-c-client/src/Logger.h	(working copy)
@@ -41,7 +41,7 @@
 	public:
 		virtual ~Logger();
 		Logger& operator<< (Level level);
-		Logger& operator<< (string& str);
+		Logger& operator<< (const string& str);
 		Logger& operator<< (const string* str);
 		Logger& operator<< (const char* str);
 		Logger& operator<< (int i);