Date: Thursday, October 19, 2006 @ 15:23:37
Author: gilles
Path: /cvsroot/carob/carob
Modified: include/Common.hpp (1.46 -> 1.47) src/Common.cpp (1.44 -> 1.45)
Removed redundant types for toWString / toUserString implems. Now only define
int[16|32|64]_t, no longer 'int', 'long' or such system dependant sized types
Consider it as a part of CAROB-88
--------------------+
include/Common.hpp | 13 ++++++++-----
src/Common.cpp | 10 ++++------
2 files changed, 12 insertions(+), 11 deletions(-)
Index: carob/include/Common.hpp
diff -u carob/include/Common.hpp:1.46 carob/include/Common.hpp:1.47
--- carob/include/Common.hpp:1.46 Wed Sep 20 17:09:29 2006
+++ carob/include/Common.hpp Thu Oct 19 15:23:37 2006
@@ -201,13 +201,12 @@
* Implemented so far:
* char
* wchar_t
- * uint16_t
* int16_t
+ * uint16_t
+ * int32_t
* uint32_t
* int64_t
* uint64_t
- * int
- * long
* float
* double
* @see toWString(const T&)
@@ -222,12 +221,16 @@
* eg. 123abc will be transformed to 123
* Function found at http://www.codeguru.com/forum/showthread.php?t=231054
* Types implemented so far:
- * int
+ * char
+ * wchar_t
+ * int16_t
+ * uint16_t
+ * int32_t
+ * uint32_t
* int64_t
* uint64_t
* float
* double
- *
* @return true if the conversion succeeded, false otherwise
*/
template <class T> bool wstringTo(T& t, const std::wstring& s);
Index: carob/src/Common.cpp
diff -u carob/src/Common.cpp:1.44 carob/src/Common.cpp:1.45
--- carob/src/Common.cpp:1.44 Wed Sep 20 17:09:29 2006
+++ carob/src/Common.cpp Thu Oct 19 15:23:37 2006
@@ -327,13 +327,12 @@
// Don't forget to update javadoc when changing this
template wstring CarobNS::toWString<char>(const char&);
template wstring CarobNS::toWString<wchar_t>(const wchar_t&);
-template wstring CarobNS::toWString<uint16_t>(const uint16_t&);
template wstring CarobNS::toWString<int16_t>(const int16_t&);
+template wstring CarobNS::toWString<uint16_t>(const uint16_t&);
+template wstring CarobNS::toWString<int32_t>(const int32_t&);
template wstring CarobNS::toWString<uint32_t>(const uint32_t&);
template wstring CarobNS::toWString<int64_t>(const int64_t&);
template wstring CarobNS::toWString<uint64_t>(const uint64_t&);
-template wstring CarobNS::toWString<int>(const int&);
-template wstring CarobNS::toWString<long>(const long&);
template wstring CarobNS::toWString<float>(const float&);
template wstring CarobNS::toWString<double>(const double&);
@@ -349,13 +348,12 @@
template wstring CarobNS::toUserString<char>(const char&);
template wstring CarobNS::toUserString<wchar_t>(const wchar_t&);
-template wstring CarobNS::toUserString<uint16_t>(const uint16_t&);
template wstring CarobNS::toUserString<int16_t>(const int16_t&);
+template wstring CarobNS::toUserString<uint16_t>(const uint16_t&);
+template wstring CarobNS::toUserString<int32_t>(const int32_t&);
template wstring CarobNS::toUserString<uint32_t>(const uint32_t&);
template wstring CarobNS::toUserString<int64_t>(const int64_t&);
template wstring CarobNS::toUserString<uint64_t>(const uint64_t&);
-template wstring CarobNS::toUserString<int>(const int&);
-template wstring CarobNS::toUserString<long>(const long&);
template wstring CarobNS::toUserString<float>(const float&);
template wstring CarobNS::toUserString<double>(const double&);
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
