Date: Tuesday, November 15, 2005 @ 18:20:48
Author: marc
Path: /cvsroot/carob/carob
Modified: include/Common.hpp (1.9 -> 1.10) src/Connection.cpp (1.21 ->
1.22)
LINE_SEPARATOR is now a global instead of a macro. Avoids scary typing issues.
--------------------+
include/Common.hpp | 6 ++++--
src/Connection.cpp | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
Index: carob/include/Common.hpp
diff -u carob/include/Common.hpp:1.9 carob/include/Common.hpp:1.10
--- carob/include/Common.hpp:1.9 Thu Nov 10 12:00:31 2005
+++ carob/include/Common.hpp Tue Nov 15 18:20:48 2005
@@ -51,11 +51,13 @@
// Line separator (EOL)
//TODO: get this at runtime => ???
+const wchar_t LINE_SEPARATOR[] =
#ifdef WIN32
-#define LINE_SEPARATOR L"\r\n"
+ L"\r\n"
#else
-#define LINE_SEPARATOR L"\n"
+ L"\n"
#endif
+ ;
/** The current log level (set by setLogLevel) */
extern LogLevel currentLogLevel;
Index: carob/src/Connection.cpp
diff -u carob/src/Connection.cpp:1.21 carob/src/Connection.cpp:1.22
--- carob/src/Connection.cpp:1.21 Tue Nov 15 17:25:59 2005
+++ carob/src/Connection.cpp Tue Nov 15 18:20:48 2005
@@ -176,7 +176,7 @@
*driverSocketPtr>>controllerNeedsSqlSkeleton;
needsSkelRead = true;
// So the controller can correctly parse our requests
- *driverSocketPtr << (wchar_t*) LINE_SEPARATOR;
+ *driverSocketPtr << LINE_SEPARATOR;
}
}
catch (SocketIOException sockIOExcpt)
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
