Date: Wednesday, June 21, 2006 @ 16:01:02
Author: marc
Path: /cvsroot/carob/carob
Modified: include/ConnectionParameters.hpp (1.24 -> 1.25)
src/ConnectionParameters.cpp (1.19 -> 1.20)
DEFAULT_* ConnectionParameters are no more macros but real constants
----------------------------------+
include/ConnectionParameters.hpp | 22 ++++++++++------------
src/ConnectionParameters.cpp | 14 ++++++++++++++
2 files changed, 24 insertions(+), 12 deletions(-)
Index: carob/include/ConnectionParameters.hpp
diff -u carob/include/ConnectionParameters.hpp:1.24
carob/include/ConnectionParameters.hpp:1.25
--- carob/include/ConnectionParameters.hpp:1.24 Mon Jun 5 20:25:36 2006
+++ carob/include/ConnectionParameters.hpp Wed Jun 21 16:01:01 2006
@@ -75,18 +75,6 @@
in_port_t host_port;
};
-/**
- * Constants for connection defaults
- */
-#define DEFAULT_HOST L"localhost"
-#define DEFAULT_PORT ((in_port_t)25322)
-#define DEFAULT_USER L"user"
-#define DEFAULT_PASSWD L""
-#define DEFAULT_DB L"myDB"
-#define DEFAULT_POLICY ROUND_ROBIN
-#define DEFAULT_RETRY_INTERVAL 10
-#define DEFAULT_CONNECTION_PERSISTENCY false
-#define DEFAULT_RETRIEVE_SQL_WARNINGS false
/**
* Exception on connection send when no more controller is reachable in the
@@ -111,6 +99,16 @@
class ConnectionParameters
{
public:
+ static const std::wstring DEFAULT_HOST;
+ static const in_port_t DEFAULT_PORT;
+ static const std::wstring DEFAULT_USER;
+ static const std::wstring DEFAULT_PASSWD;
+ static const std::wstring DEFAULT_DB;
+ static const ConnectPolicy DEFAULT_POLICY;
+ static const int DEFAULT_RETRY_INTERVAL;
+ static const bool DEFAULT_CONNECTION_PERSISTENCY;
+ static const bool DEFAULT_RETRIEVE_SQL_WARNINGS;
+
/**
* Creates instance with set of values
*/
Index: carob/src/ConnectionParameters.cpp
diff -u carob/src/ConnectionParameters.cpp:1.19
carob/src/ConnectionParameters.cpp:1.20
--- carob/src/ConnectionParameters.cpp:1.19 Mon Jun 5 20:25:36 2006
+++ carob/src/ConnectionParameters.cpp Wed Jun 21 16:01:02 2006
@@ -29,6 +29,20 @@
using namespace CarobNS;
+/**
+ * Constants for connection defaults
+ */
+const std::wstring ConnectionParameters::DEFAULT_HOST =
L"localhost";
+const in_port_t ConnectionParameters::DEFAULT_PORT =
25322 ;
+const std::wstring ConnectionParameters::DEFAULT_USER =
L"user";
+const std::wstring ConnectionParameters::DEFAULT_PASSWD =
L"" ;
+const std::wstring ConnectionParameters::DEFAULT_DB =
L"myDB" ;
+const ConnectPolicy ConnectionParameters::DEFAULT_POLICY =
ROUND_ROBIN;
+const int ConnectionParameters::DEFAULT_RETRY_INTERVAL =
10 ;
+const bool ConnectionParameters::DEFAULT_CONNECTION_PERSISTENCY =
false ;
+const bool ConnectionParameters::DEFAULT_RETRIEVE_SQL_WARNINGS =
false ;
+
+
ControllerInfo::ControllerInfo() :
host_name(L""),
host_port(0)
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
