Date: Tuesday, February 14, 2006 @ 12:05:05
Author: csaba
Path: /cvsroot/carob/carob
Modified: include/SQLDataSerialization.hpp (1.11 -> 1.12)
src/JavaSocket.cpp (1.38 -> 1.39) src/ParameterStatement.cpp
(1.20 -> 1.21) src/SQLDataSerialization.cpp (1.25 -> 1.26)
test/40-Parameter-PreparedStatement/TestIEEE754.cpp (1.8 -> 1.9)
Enable compilation with gcc 3.3.5 - fix CAROB-63
-----------------------------------------------------+
include/SQLDataSerialization.hpp | 2 ++
src/JavaSocket.cpp | 2 +-
src/ParameterStatement.cpp | 5 ++---
src/SQLDataSerialization.cpp | 2 +-
test/40-Parameter-PreparedStatement/TestIEEE754.cpp | 5 ++---
5 files changed, 8 insertions(+), 8 deletions(-)
Index: carob/include/SQLDataSerialization.hpp
diff -u carob/include/SQLDataSerialization.hpp:1.11
carob/include/SQLDataSerialization.hpp:1.12
--- carob/include/SQLDataSerialization.hpp:1.11 Wed Feb 1 13:39:24 2006
+++ carob/include/SQLDataSerialization.hpp Tue Feb 14 12:05:05 2006
@@ -22,6 +22,8 @@
#ifndef SQLDATASERIALIZATION_H_
#define SQLDATASERIALIZATION_H_
+#include <stdint.h> // for uint8_t, int32_t, uint32_t, int64_t, uint64_t
+
#include "CarobException.hpp"
namespace CarobNS {
Index: carob/src/JavaSocket.cpp
diff -u carob/src/JavaSocket.cpp:1.38 carob/src/JavaSocket.cpp:1.39
--- carob/src/JavaSocket.cpp:1.38 Wed Feb 1 16:19:18 2006
+++ carob/src/JavaSocket.cpp Tue Feb 14 12:05:05 2006
@@ -393,7 +393,7 @@
{
#ifndef __BYTE_ORDER // typically found through <sys/param.h>
// or <netinet/*.h>
-#error __BYTE_ORDER undefined: unknown endianness, can't implement 64bits swaps
+#error "__BYTE_ORDER undefined: unknown endianness, can't implement 64bits
swaps"
#endif
#if __BYTE_ORDER == __BIG_ENDIAN
return n;
Index: carob/src/ParameterStatement.cpp
diff -u carob/src/ParameterStatement.cpp:1.20
carob/src/ParameterStatement.cpp:1.21
--- carob/src/ParameterStatement.cpp:1.20 Wed Feb 1 16:49:32 2006
+++ carob/src/ParameterStatement.cpp Tue Feb 14 12:05:05 2006
@@ -28,8 +28,7 @@
#include <sstream>
-#include <math.h> // C99 has isinf(), isnan(), etc.
-// #include <cmath> // and they are not available in C+98!
+#include <cmath>
namespace CarobNS {
@@ -262,7 +261,7 @@
// now the exceptional cases
// Bug: java.lang.FloatingDecimal#readJavaFormatString()
// ignores negative sign of NaN
- if (signbit(value))
+ if (std::signbit(value))
wrapped_stream << L"-";
// Too bad Standard C99 and Java could not agree on the same strings :-(
Index: carob/src/SQLDataSerialization.cpp
diff -u carob/src/SQLDataSerialization.cpp:1.25
carob/src/SQLDataSerialization.cpp:1.26
--- carob/src/SQLDataSerialization.cpp:1.25 Wed Feb 1 16:39:16 2006
+++ carob/src/SQLDataSerialization.cpp Tue Feb 14 12:05:05 2006
@@ -27,7 +27,7 @@
#include "CarobException.hpp"
#include "Common.hpp"
-#include <math.h>
+#include <cmath>
// What IEEE 754 grants that matters to us:
Index: carob/test/40-Parameter-PreparedStatement/TestIEEE754.cpp
diff -u carob/test/40-Parameter-PreparedStatement/TestIEEE754.cpp:1.8
carob/test/40-Parameter-PreparedStatement/TestIEEE754.cpp:1.9
--- carob/test/40-Parameter-PreparedStatement/TestIEEE754.cpp:1.8 Fri Jan
27 15:59:20 2006
+++ carob/test/40-Parameter-PreparedStatement/TestIEEE754.cpp Tue Feb 14
12:05:05 2006
@@ -23,8 +23,7 @@
#include "ParameterStatement.hpp"
-#include <math.h> // C99 has isinf(), isnan(), etc.
-// #include <cmath> // and they are not available in C+98
+#include <cmath>
#include <limits>
@@ -74,7 +73,7 @@
better_equal(FP a, FP b)
{
if (isnan(a))
- return (isnan(b) && (signbit(a) == signbit(b)));
+ return (isnan(b) && (std::signbit(a) == std::signbit(b)));
else
return (a == b);
}
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
