Date: Thursday, May 11, 2006 @ 15:42:51
Author: marc
Path: /cvsroot/carob/carob
Modified: include/ConnectionParameters.hpp (1.22 -> 1.23)
include/JavaSocket.hpp (1.28 -> 1.29) src/ParameterStatement.cpp
(1.29 -> 1.30)
Untabify. Minor WIN32 comments added.
----------------------------------+
include/ConnectionParameters.hpp | 4 ++--
include/JavaSocket.hpp | 2 +-
src/ParameterStatement.cpp | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
Index: carob/include/ConnectionParameters.hpp
diff -u carob/include/ConnectionParameters.hpp:1.22
carob/include/ConnectionParameters.hpp:1.23
--- carob/include/ConnectionParameters.hpp:1.22 Fri May 5 19:00:56 2006
+++ carob/include/ConnectionParameters.hpp Thu May 11 15:42:51 2006
@@ -25,9 +25,9 @@
#include "CarobException.hpp"
#ifdef __WIN32__
- #include <winsock2.h>
+ #include <winsock2.h>
#include <ws2tcpip.h>
- #include "Common.hpp" //for in_port_t
+ #include "Common.hpp" //for in_port_t
#else
#include <netinet/in.h> // in_port_t
#endif
Index: carob/include/JavaSocket.hpp
diff -u carob/include/JavaSocket.hpp:1.28 carob/include/JavaSocket.hpp:1.29
--- carob/include/JavaSocket.hpp:1.28 Fri May 5 19:00:56 2006
+++ carob/include/JavaSocket.hpp Thu May 11 15:42:51 2006
@@ -32,7 +32,7 @@
#ifdef __WIN32__
#include <winsock2.h>
#else
- #include <netinet/in.h> //for in_addr_t
+ #include <netinet/in.h> //for in_addr_t
#endif
Index: carob/src/ParameterStatement.cpp
diff -u carob/src/ParameterStatement.cpp:1.29
carob/src/ParameterStatement.cpp:1.30
--- carob/src/ParameterStatement.cpp:1.29 Fri May 5 19:00:56 2006
+++ carob/src/ParameterStatement.cpp Thu May 11 15:42:51 2006
@@ -29,13 +29,13 @@
#include <sstream>
#ifdef __WIN32__
- #include "math.h"
+ #include "math.h" // C
#else
- #include <cmath>
+ #include <cmath> // C++
#endif
#ifndef __WIN32__
-using std::signbit;
+ using std::signbit; // so to be C/C++ ambiguous?
#endif
namespace CarobNS {
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
