Date: Monday, January 30, 2006 @ 12:09:30
Author: marc
Path: /cvsroot/carob/carob
Modified: include/CarobException.hpp (1.34 -> 1.35) src/CarobException.cpp
(1.18 -> 1.19)
Moved StackTraceElement::toWString() implementation from .hpp to .cpp
file so we don't #include <sstream> anymore in every file of the
project.
----------------------------+
include/CarobException.hpp | 10 ++--------
src/CarobException.cpp | 20 ++++++++++++++++++++
2 files changed, 22 insertions(+), 8 deletions(-)
Index: carob/include/CarobException.hpp
diff -u carob/include/CarobException.hpp:1.34
carob/include/CarobException.hpp:1.35
--- carob/include/CarobException.hpp:1.34 Wed Jan 25 18:27:26 2006
+++ carob/include/CarobException.hpp Mon Jan 30 12:09:30 2006
@@ -24,7 +24,6 @@
#include <string>
#include <vector>
-#include <sstream>
namespace CarobNS {
@@ -329,13 +328,8 @@
* Provides a string representation of the element.
* @return all members formated in a single string
*/
- std::wstring toWString() const
- {
- std::wostringstream oss;
- oss << L"at " << declaringClass << L"." << methodName
- << L"(" << fileName << L":" << lineNumber << L")";
- return oss.str();
- }
+ std::wstring toWString() const;
+
private:
// we would like to have const members (and initializer lists)
// but we would then rely on declaration order; plus there is
Index: carob/src/CarobException.cpp
diff -u carob/src/CarobException.cpp:1.18 carob/src/CarobException.cpp:1.19
--- carob/src/CarobException.cpp:1.18 Wed Jan 25 18:27:26 2006
+++ carob/src/CarobException.cpp Mon Jan 30 12:09:30 2006
@@ -24,6 +24,8 @@
#include "Common.hpp"
#include "DriverSocket.hpp"
+#include <sstream>
+
#ifdef __GLIBC__ // from features.h
#define GLIB_BACKTRACE
#include <execinfo.h>
@@ -121,3 +123,21 @@
ds>>fileName;
ds>>lineNumber;
}
+
+std::wstring
+StackTraceElement::toWString() const
+{
+ std::wostringstream oss;
+ oss << L"at " << declaringClass << L"." << methodName
+ << L"(" << fileName << L":" << lineNumber << L")";
+ return oss.str();
+}
+
+
+/*
+ * Local Variables:
+ * c-file-style: "bsd"
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits