Date: Thursday, December 22, 2005 @ 14:51:29
Author: marc
Path: /cvsroot/carob/carob
Modified: include/ConnectionParameters.hpp (1.9 -> 1.10)
src/ConnectionParameters.cpp (1.7 -> 1.8)
Added missing throw (ConnectionException)
----------------------------------+
include/ConnectionParameters.hpp | 8 +++++---
src/ConnectionParameters.cpp | 7 +++----
2 files changed, 8 insertions(+), 7 deletions(-)
Index: carob/include/ConnectionParameters.hpp
diff -u carob/include/ConnectionParameters.hpp:1.9
carob/include/ConnectionParameters.hpp:1.10
--- carob/include/ConnectionParameters.hpp:1.9 Thu Dec 22 14:17:13 2005
+++ carob/include/ConnectionParameters.hpp Thu Dec 22 14:51:29 2005
@@ -24,6 +24,8 @@
#include <string>
+#include "CarobException.hpp"
+
namespace CarobNS {
enum DebugLevel
@@ -60,7 +62,7 @@
*/
ConnectionParameters(const std::wstring&, const inetport_t&,
const std::wstring&, const std::wstring&, const std::wstring&,
- const DebugLevel&);
+ const DebugLevel&) throw (ConnectionException, UnexpectedException);
virtual ~ConnectionParameters();
@@ -78,7 +80,7 @@
/** Gives the host name */
inline std::wstring getHostName() const { return hostName; }
/** Sets the host name */
- void setHostName(const std::wstring&);
+ void setHostName(const std::wstring&) throw
(ConnectionException, UnexpectedException);
/** Gives the host port */
inline inetport_t getHostPort() const { return hostPort; }
/** Sets the host port */
@@ -86,7 +88,7 @@
/** Gives the database name */
inline std::wstring getDatabaseName() const { return databaseName; }
/** Sets the database name */
- void setDatabaseName(const std::wstring&);
+ void setDatabaseName(const std::wstring&) throw
(ConnectionException, UnexpectedException);
/** Gives the user name */
inline std::wstring getUserName() const { return userName; }
/** Sets the user name */
Index: carob/src/ConnectionParameters.cpp
diff -u carob/src/ConnectionParameters.cpp:1.7
carob/src/ConnectionParameters.cpp:1.8
--- carob/src/ConnectionParameters.cpp:1.7 Wed Dec 21 20:09:57 2005
+++ carob/src/ConnectionParameters.cpp Thu Dec 22 14:51:29 2005
@@ -19,9 +19,7 @@
* Contributor(s):
*/
-#include "Common.hpp"
#include "ConnectionParameters.hpp"
-#include "CarobException.hpp"
using std::wstring;
@@ -40,6 +38,7 @@
ConnectionParameters::ConnectionParameters(const wstring& host, const
inetport_t& port,
const wstring& db, const wstring&
uname,
const wstring& upass, const
DebugLevel& dl)
+ throw (ConnectionException, UnexpectedException)
{
setHostName(host);
setHostPort(port);
@@ -53,7 +52,7 @@
{
}
-void ConnectionParameters::setHostName(const wstring& hostNamePrm)
+void ConnectionParameters::setHostName(const wstring& hostNamePrm) throw
(ConnectionException, UnexpectedException)
{
wchar_t pbChar;
hostName = hostNamePrm;
@@ -65,7 +64,7 @@
}
}
-void ConnectionParameters::setDatabaseName(const wstring& dbname)
+void ConnectionParameters::setDatabaseName(const wstring& dbname) throw
(ConnectionException, UnexpectedException)
{
wchar_t pbChar;
if (isValidDatabaseName(dbname, pbChar))
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits