Date: Friday, January 20, 2006 @ 20:49:09
Author: marc
Path: /cvsroot/carob/carob
Modified: include/ParameterStatement.hpp (1.7 -> 1.8)
src/ParameterStatement.cpp (1.4 -> 1.5)
Moved private constants from .hpp to .cpp
--------------------------------+
include/ParameterStatement.hpp | 43 ----------------------------------
src/ParameterStatement.cpp | 49 ++++++++++++++++++++++++++++++++++++++-
2 files changed, 48 insertions(+), 44 deletions(-)
Index: carob/include/ParameterStatement.hpp
diff -u carob/include/ParameterStatement.hpp:1.7
carob/include/ParameterStatement.hpp:1.8
--- carob/include/ParameterStatement.hpp:1.7 Thu Jan 12 17:33:46 2006
+++ carob/include/ParameterStatement.hpp Fri Jan 20 20:49:09 2006
@@ -30,49 +30,6 @@
namespace CarobNS {
-/**
- * All tags must have the same length
- */
-const std::wstring BYTE_TAG = L"b|";
-const std::wstring BYTES_TAG = L"B|";
-const std::wstring BLOB_TAG = L"c|";
-const std::wstring CLOB_TAG = L"C|";
-const std::wstring BOOLEAN_TAG = L"0|";
-const std::wstring BIG_DECIMAL_TAG = L"1|";
-const std::wstring DATE_TAG = L"d|";
-const std::wstring DOUBLE_TAG = L"D|";
-const std::wstring FLOAT_TAG = L"F|";
-const std::wstring INTEGER_TAG = L"I|";
-const std::wstring LONG_TAG = L"L|";
-const std::wstring NULL_TAG = L"N|";
-const std::wstring NULL_STRING_TAG = L"n|";
-const std::wstring OBJECT_TAG = L"O|";
-const std::wstring REF_TAG = L"R|";
-const std::wstring SHORT_TAG = L"s|";
-const std::wstring STRING_TAG = L"S|";
-const std::wstring TIME_TAG = L"t|";
-const std::wstring TIMESTAMP_TAG = L"T|";
-const std::wstring URL_TAG = L"U|";
-const std::wstring REGISTER_OUT_PARAMETER = L"o|";
-const std::wstring REGISTER_OUT_PARAMETER_WITH_SCALE = L"w|";
-const std::wstring REGISTER_OUT_PARAMETER_WITH_NAME = L"W|";
-
-/** Tag maker for parameters */
-const std::wstring TAG_MARKER = L"!%";
-/** Escape for tag maker */
-const std::wstring TAG_MARKER_ESCAPE = TAG_MARKER
- + L";";
-
-/** Tag for parameters start delimiter */
-const std::wstring START_PARAM_TAG = L"<"
- + TAG_MARKER;
-/** Tag for parameters end delimiter */
-const std::wstring END_PARAM_TAG = L"|"
- + TAG_MARKER
- + L">";
-
-const std::wstring wsBoolFalse = L"false";
-const std::wstring wsBoolTrue = L"true";
class Connection;
Index: carob/src/ParameterStatement.cpp
diff -u carob/src/ParameterStatement.cpp:1.4
carob/src/ParameterStatement.cpp:1.5
--- carob/src/ParameterStatement.cpp:1.4 Wed Jan 11 20:14:27 2006
+++ carob/src/ParameterStatement.cpp Fri Jan 20 20:49:09 2006
@@ -18,12 +18,59 @@
* Initial developer(s): Zsolt Simon
* Contributor(s): Gilles Rayrat
*/
+#include "ParameterStatement.hpp"
#include "Common.hpp"
-#include "ParameterStatement.hpp"
#include "CarobException.hpp"
#include "Connection.hpp"
+namespace CarobNS {
+/**
+ * All tags must have the same length
+ */
+const std::wstring BYTE_TAG = L"b|";
+const std::wstring BYTES_TAG = L"B|";
+const std::wstring BLOB_TAG = L"c|";
+const std::wstring CLOB_TAG = L"C|";
+const std::wstring BOOLEAN_TAG = L"0|";
+const std::wstring BIG_DECIMAL_TAG = L"1|";
+const std::wstring DATE_TAG = L"d|";
+const std::wstring DOUBLE_TAG = L"D|";
+const std::wstring FLOAT_TAG = L"F|";
+const std::wstring INTEGER_TAG = L"I|";
+const std::wstring LONG_TAG = L"L|";
+const std::wstring NULL_TAG = L"N|";
+const std::wstring NULL_STRING_TAG = L"n|";
+const std::wstring OBJECT_TAG = L"O|";
+const std::wstring REF_TAG = L"R|";
+const std::wstring SHORT_TAG = L"s|";
+const std::wstring STRING_TAG = L"S|";
+const std::wstring TIME_TAG = L"t|";
+const std::wstring TIMESTAMP_TAG = L"T|";
+const std::wstring URL_TAG = L"U|";
+const std::wstring REGISTER_OUT_PARAMETER = L"o|";
+const std::wstring REGISTER_OUT_PARAMETER_WITH_SCALE = L"w|";
+const std::wstring REGISTER_OUT_PARAMETER_WITH_NAME = L"W|";
+
+/** Tag maker for parameters */
+const std::wstring TAG_MARKER = L"!%";
+/** Escape for tag maker */
+const std::wstring TAG_MARKER_ESCAPE = TAG_MARKER
+ + L";";
+
+/** Tag for parameters start delimiter */
+const std::wstring START_PARAM_TAG = L"<"
+ + TAG_MARKER;
+/** Tag for parameters end delimiter */
+const std::wstring END_PARAM_TAG = L"|"
+ + TAG_MARKER
+ + L">";
+
+const std::wstring wsBoolFalse = L"false";
+const std::wstring wsBoolTrue = L"true";
+
+}
+
using std::wstring;
using namespace CarobNS;
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
