Date: Friday, December 2, 2005 @ 10:06:56
Author: gilles
Path: /cvsroot/carob/carob
Modified: include/DriverResultSet.hpp (1.14 -> 1.15) src/Connection.cpp
(1.31 -> 1.32) src/Statement.cpp (1.10 -> 1.11)
Changed ResultSetOrUpdateCount structure to use anonymous union so we can do
struct.resultSetPtr or struct.updateCount directly (with no XXX.value.YYY
anymore)
-----------------------------+
include/DriverResultSet.hpp | 4 ++--
src/Connection.cpp | 6 +++---
src/Statement.cpp | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
Index: carob/include/DriverResultSet.hpp
diff -u carob/include/DriverResultSet.hpp:1.14
carob/include/DriverResultSet.hpp:1.15
--- carob/include/DriverResultSet.hpp:1.14 Thu Dec 1 19:10:15 2005
+++ carob/include/DriverResultSet.hpp Fri Dec 2 10:06:56 2005
@@ -294,13 +294,13 @@
/** Whether the value is a ResultSet (true) or an updateCount (false) */
bool isResultSet;
/** Value itself. Can be either a DriverResultSet or an updateCount */
- union RSorUC
+ union
{
/** Pointer (to avoid copy of large objects) to a DriverResultSet object */
DriverResultSet* resultSetPtr;
/** Number of column concerned by the update */
int32_t updateCount;
- } value;
+ };
} ResultSetOrUpdateCount;
#endif /*DRIVERRESULTSET_H_*/
Index: carob/src/Connection.cpp
diff -u carob/src/Connection.cpp:1.31 carob/src/Connection.cpp:1.32
--- carob/src/Connection.cpp:1.31 Thu Dec 1 19:10:15 2005
+++ carob/src/Connection.cpp Fri Dec 2 10:06:55 2005
@@ -581,17 +581,17 @@
if (hasResult)
{
resultReceived.isResultSet = true;
- resultReceived.value.resultSetPtr = receiveResultSet();
+ resultReceived.resultSetPtr = receiveResultSet();
}
else
{
resultReceived.isResultSet = false;
- resultReceived.value.updateCount = receiveIntOrException();
+ resultReceived.updateCount = receiveIntOrException();
}
results.push_back(resultReceived);
}
- while (hasResult || resultReceived.value.updateCount != -1);
+ while (hasResult || resultReceived.updateCount != -1);
}
catch (SocketIOException sioe)
{
Index: carob/src/Statement.cpp
diff -u carob/src/Statement.cpp:1.10 carob/src/Statement.cpp:1.11
--- carob/src/Statement.cpp:1.10 Thu Dec 1 19:10:15 2005
+++ carob/src/Statement.cpp Fri Dec 2 10:06:55 2005
@@ -152,13 +152,13 @@
resultListIterator++;
if (nextResult.isResultSet)
{
- resultPtr = nextResult.value.resultSetPtr;
+ resultPtr = nextResult.resultSetPtr;
resultPtr->setStatement(this);
return true;
}
else
{
- updateCount = nextResult.value.updateCount;
+ updateCount = nextResult.updateCount;
return false;
}
}
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
