Date: Thursday, December 1, 2005 @ 19:22:00
Author: gilles
Path: /cvsroot/carob/carob/include
Modified: CarobException.hpp (1.17 -> 1.18)
Minor formatting fixes
--------------------+
CarobException.hpp | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
Index: carob/include/CarobException.hpp
diff -u carob/include/CarobException.hpp:1.17
carob/include/CarobException.hpp:1.18
--- carob/include/CarobException.hpp:1.17 Thu Dec 1 19:10:15 2005
+++ carob/include/CarobException.hpp Thu Dec 1 19:21:59 2005
@@ -26,18 +26,18 @@
#include <vector>
#include <sstream>
-#include "Common.hpp"
-
-class StackTraceElement;
-class CarobException;
-class DriverSocket;
-
#ifdef __GLIBC__ // from features.h
#define GLIB_BACKTRACE
#include <execinfo.h>
#include <stdlib.h>
#endif // __GLIBC__
+#include "Common.hpp"
+
+class StackTraceElement;
+class CarobException;
+class DriverSocket;
+
// TODO: convert this to wstring (for uniformity reasons)
typedef std::vector<std::string> BackTrace;
@@ -106,13 +106,13 @@
protected:
/** Error message */
- std::wstring message;
+ std::wstring message;
/** Stack trace as a vector of traces */
StackTrace stackTrace;
/** pointer to the exception that generated this one */
CarobException* causePtr;
/** SQL error message */
- std::wstring SQLState;
+ std::wstring SQLState;
/** Vendor-specific error code */
int32_t errorCode;
/** Local stack trace when available */
@@ -308,17 +308,18 @@
std::wstring toWString() const
{
std::wostringstream oss;
- oss << L"at " << declaringClass << L"." << methodName << L"(" << fileName
<< L":" << lineNumber << L")";
+ oss << L"at " << declaringClass << L"." << methodName
+ << L"(" << fileName << L":" << lineNumber << L")";
return oss.str();
}
private:
// we would like to have const members (and initializer lists)
// but we would then rely on declaration order; plus there is
// a syntax issue with operator>>
- std::wstring declaringClass;
- std::wstring methodName;
- std::wstring fileName;
- int32_t lineNumber;
+ std::wstring declaringClass;
+ std::wstring methodName;
+ std::wstring fileName;
+ int32_t lineNumber;
};
#endif //_CAROBEXCEPTION_H_
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
