[Box Backup-commit] COMMIT r2662 - box/RELEASE/0.11rc7/lib/common

[subversion at boxbackup.org]

Author: chris
Date: 2010-03-08 21:38:17 +0000 (Mon, 08 Mar 2010)
New Revision: 2662

Modified:
   box/RELEASE/0.11rc7/lib/common/Box.h
Log:
Merge [2606] from trunk into 0.11rc7. Support throwing exception with 
more complex stringstream-formatted messages.


Modified: box/RELEASE/0.11rc7/lib/common/Box.h
===================================================================
--- box/RELEASE/0.11rc7/lib/common/Box.h	2010-03-08 21:35:19 UTC (rev 2661)
+++ box/RELEASE/0.11rc7/lib/common/Box.h	2010-03-08 21:38:17 UTC (rev 2662)
@@ -115,6 +115,8 @@
 
 #define THROW_EXCEPTION_MESSAGE(type, subtype, message) \
 	{ \
+		std::ostringstream _box_throw_line; \
+		_box_throw_line << message; \
 		if(!HideExceptionMessageGuard::ExceptionsHidden()) \
 		{ \
 			OPTIONAL_DO_BACKTRACE \
@@ -122,7 +124,7 @@
 				#type "(" #subtype ") (" << message << \
 				") at " __FILE__ "(" << __LINE__ << ")") \
 		} \
-		throw type(type::subtype, message); \
+		throw type(type::subtype, _box_throw_line.str()); \
 	}
 
 // extra macros for converting to network byte order