Date: Monday, January 29, 2007 @ 15:46:22
Author: marc
Path: /cvsroot/carob/carob/test
Modified: ConnectionSetup.cpp (1.17 -> 1.18) ConnectionSetup.hpp (1.10 ->
1.11)
Fixed static initialization order fiasco (C++ FAQ lite 10.12)
---------------------+
ConnectionSetup.cpp | 20 ++++++++++----------
ConnectionSetup.hpp | 10 +++++-----
2 files changed, 15 insertions(+), 15 deletions(-)
Index: carob/test/ConnectionSetup.cpp
diff -u carob/test/ConnectionSetup.cpp:1.17 carob/test/ConnectionSetup.cpp:1.18
--- carob/test/ConnectionSetup.cpp:1.17 Wed Dec 20 17:42:11 2006
+++ carob/test/ConnectionSetup.cpp Mon Jan 29 15:46:22 2007
@@ -33,21 +33,21 @@
using namespace CarobNS;
#ifdef CAROB_TEST_USE_MYSQL
-const std::wstring ConnectionSetup::DEFAULT_HOST1 = L"node1";
-const std::wstring ConnectionSetup::DEFAULT_HOST2 = L"node2";
+const std::wstring& ConnectionSetup::DEFAULT_HOST1 = L"node1";
+const std::wstring& ConnectionSetup::DEFAULT_HOST2 = L"node2";
const int ConnectionSetup::DEFAULT_PORT1 = 25322;
const int ConnectionSetup::DEFAULT_PORT2 = 25322;
-const std::wstring ConnectionSetup::DEFAULT_DB = L"DB1";
-const std::wstring ConnectionSetup::DEFAULT_USER = L"user";
-const std::wstring ConnectionSetup::DEFAULT_PASSWD = L"pass";
+const std::wstring& ConnectionSetup::DEFAULT_DB = L"DB1";
+const std::wstring& ConnectionSetup::DEFAULT_USER = L"user";
+const std::wstring& ConnectionSetup::DEFAULT_PASSWD = L"pass";
#else
-const std::wstring ConnectionSetup::DEFAULT_HOST1 = L"localhost";
-const std::wstring ConnectionSetup::DEFAULT_HOST2 = L"localhost";
+const std::wstring& ConnectionSetup::DEFAULT_HOST1 = L"localhost";
+const std::wstring& ConnectionSetup::DEFAULT_HOST2 = L"localhost";
const int ConnectionSetup::DEFAULT_PORT1 = 25322;
const int ConnectionSetup::DEFAULT_PORT2 = 25323;
-const std::wstring ConnectionSetup::DEFAULT_DB =
ConnectionParameters::DEFAULT_DB;
-const std::wstring ConnectionSetup::DEFAULT_USER =
ConnectionParameters::DEFAULT_USER;
-const std::wstring ConnectionSetup::DEFAULT_PASSWD =
ConnectionParameters::DEFAULT_PASSWD;
+const std::wstring& ConnectionSetup::DEFAULT_DB =
ConnectionParameters::DEFAULT_DB;
+const std::wstring& ConnectionSetup::DEFAULT_USER =
ConnectionParameters::DEFAULT_USER;
+const std::wstring& ConnectionSetup::DEFAULT_PASSWD =
ConnectionParameters::DEFAULT_PASSWD;
#endif
const CarobNS::ConnectPolicy ConnectionSetup::DEFAULT_POLICY =
ConnectionParameters::DEFAULT_POLICY;
const int ConnectionSetup::DEFAULT_PING_DELAY =
ConnectionParameters::DEFAULT_PING_DELAY;
Index: carob/test/ConnectionSetup.hpp
diff -u carob/test/ConnectionSetup.hpp:1.10 carob/test/ConnectionSetup.hpp:1.11
--- carob/test/ConnectionSetup.hpp:1.10 Fri Dec 22 11:22:44 2006
+++ carob/test/ConnectionSetup.hpp Mon Jan 29 15:46:22 2007
@@ -45,19 +45,19 @@
{
public:
/** Default first controller host used for the tests */
- const static std::wstring DEFAULT_HOST1;
+ const static std::wstring& DEFAULT_HOST1;
/** Default controller host #2 used for the tests */
- const static std::wstring DEFAULT_HOST2;
+ const static std::wstring& DEFAULT_HOST2;
/** Default first controller port used for the tests */
const static int DEFAULT_PORT1;
/** Default controller port #2 used for the tests */
const static int DEFAULT_PORT2;
/** Default vdb used for the tests */
- const static std::wstring DEFAULT_DB;
+ const static std::wstring& DEFAULT_DB;
/** Default vdb user for the tests */
- const static std::wstring DEFAULT_USER;
+ const static std::wstring& DEFAULT_USER;
/** Default vdb password for the tests */
- const static std::wstring DEFAULT_PASSWD;
+ const static std::wstring& DEFAULT_PASSWD;
/** Default vdb policy for the tests */
const static CarobNS::ConnectPolicy DEFAULT_POLICY;
/** Default ping delay in milliseconds */
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
