Date: Thursday, December 22, 2005 @ 14:17:13
Author: marc
Path: /cvsroot/carob/carob
Modified: include/Common.hpp (1.25 -> 1.26)
include/ConnectionParameters.hpp (1.8 -> 1.9)
include/JavaSocket.hpp (1.17 -> 1.18) src/JavaSocket.cpp (1.24
-> 1.25)
Moved typedef inetport_t to Common.hpp. Completed replace of in_addr_t ->
inetport_t.
----------------------------------+
include/Common.hpp | 1 +
include/ConnectionParameters.hpp | 2 --
include/JavaSocket.hpp | 2 +-
src/JavaSocket.cpp | 2 +-
4 files changed, 3 insertions(+), 4 deletions(-)
Index: carob/include/Common.hpp
diff -u carob/include/Common.hpp:1.25 carob/include/Common.hpp:1.26
--- carob/include/Common.hpp:1.25 Mon Dec 19 19:32:02 2005
+++ carob/include/Common.hpp Thu Dec 22 14:17:13 2005
@@ -41,6 +41,7 @@
/** Java byte (signed) */
typedef int8_t java_byte;
+typedef uint16_t inetport_t; // fine for both IPv4 and IPv6
/**
* Available log levels, sorted by priority (last = higher)
Index: carob/include/ConnectionParameters.hpp
diff -u carob/include/ConnectionParameters.hpp:1.8
carob/include/ConnectionParameters.hpp:1.9
--- carob/include/ConnectionParameters.hpp:1.8 Wed Dec 21 20:09:57 2005
+++ carob/include/ConnectionParameters.hpp Thu Dec 22 14:17:13 2005
@@ -33,8 +33,6 @@
DEBUG_LEVEL_DEBUG
};
-typedef uint16_t inetport_t; // fine for both IPv4 and IPv6
-
/**
* Constants for connection defaults
*/
Index: carob/include/JavaSocket.hpp
diff -u carob/include/JavaSocket.hpp:1.17 carob/include/JavaSocket.hpp:1.18
--- carob/include/JavaSocket.hpp:1.17 Mon Dec 19 16:11:14 2005
+++ carob/include/JavaSocket.hpp Thu Dec 22 14:17:13 2005
@@ -75,7 +75,7 @@
* @return true upon successfull connection, false otherwise
* @throws ConnectionException
*/
- bool connectTo(const std::wstring& host, in_addr_t port)
+ bool connectTo(const std::wstring& host, inetport_t port)
throw (ConnectionException, UnexpectedException);
/**
* Closes connection.
Index: carob/src/JavaSocket.cpp
diff -u carob/src/JavaSocket.cpp:1.24 carob/src/JavaSocket.cpp:1.25
--- carob/src/JavaSocket.cpp:1.24 Thu Dec 22 14:09:32 2005
+++ carob/src/JavaSocket.cpp Thu Dec 22 14:17:13 2005
@@ -78,7 +78,7 @@
return true;
}
-bool JavaSocket::connectTo(const std::wstring& host, in_addr_t port)
+bool JavaSocket::connectTo(const std::wstring& host, inetport_t port)
throw (ConnectionException, UnexpectedException)
{
wstring fctName(L"JavaSocket::Connect");
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
