Revert "Merge remote-tracking branch 'origin/master' into ticket37"

[stg.git] / stglibs / ibpp.lib / blob.cpp

diff --git a/stglibs/ibpp.lib/blob.cpp b/stglibs/ibpp.lib/blob.cpp
index cfdd61fe339c9c7806dfa185da75302cee81a311..298fe70613218655dc47317464cab19f881dcaee 100644 (file)
--- a/stglibs/ibpp.lib/blob.cpp
+++ b/stglibs/ibpp.lib/blob.cpp
@@ -118,7 +118,7 @@ int BlobImpl::Read(void* buffer, int size)
 \r
        IBS status;\r
        unsigned short bytesread;\r
 \r
        IBS status;\r
        unsigned short bytesread;\r

-       int result = (*gds.Call()->m_get_segment)(status.Self(), &mHandle, &bytesread,\r
+       ISC_STATUS result = (*gds.Call()->m_get_segment)(status.Self(), &mHandle, &bytesread,\r

                                        (unsigned short)size, (char*)buffer);\r
        if (result == isc_segstr_eof) return 0; // Fin du blob\r
        if (result != isc_segment && status.Errors())\r
                                        (unsigned short)size, (char*)buffer);\r
        if (result == isc_segstr_eof) return 0; // Fin du blob\r
        if (result != isc_segment && status.Errors())\r


@@ -230,7 +230,7 @@ void BlobImpl::Load(std::string& data)
        {\r
                status.Reset();\r
                unsigned short bytesread;\r
        {\r
                status.Reset();\r
                unsigned short bytesread;\r

-               int result = (*gds.Call()->m_get_segment)(status.Self(), &mHandle,\r
+               ISC_STATUS result = (*gds.Call()->m_get_segment)(status.Self(), &mHandle,\r

                                                &bytesread, (unsigned short)blklen,\r
                                                        const_cast<char*>(data.data()+pos));\r
                if (result == isc_segstr_eof) break;    // End of blob\r
                                                &bytesread, (unsigned short)blklen,\r
                                                        const_cast<char*>(data.data()+pos));\r
                if (result == isc_segstr_eof) break;    // End of blob\r