diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/DataStores/DB2FileLoader.cpp | 2 | ||||
| -rw-r--r-- | src/common/DataStores/DB2FileLoader.h | 6 | ||||
| -rw-r--r-- | src/common/DataStores/DB2FileSystemSource.cpp | 8 | ||||
| -rw-r--r-- | src/common/DataStores/DB2FileSystemSource.h | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/common/DataStores/DB2FileLoader.cpp b/src/common/DataStores/DB2FileLoader.cpp index 172dd6c19fa..43c2e479096 100644 --- a/src/common/DataStores/DB2FileLoader.cpp +++ b/src/common/DataStores/DB2FileLoader.cpp @@ -1755,7 +1755,7 @@ bool DB2FileLoader::LoadHeaders(DB2FileSource* source, DB2FileLoadInfo const* lo if (loadInfo && !(_header.Flags & 0x1)) { - std::size_t expectedFileSize = + int64 expectedFileSize = sizeof(DB2Header) + sizeof(DB2SectionHeader) * _header.SectionCount + sizeof(DB2FieldEntry) * _header.FieldCount + diff --git a/src/common/DataStores/DB2FileLoader.h b/src/common/DataStores/DB2FileLoader.h index 8442805c64a..6a15e0b3a4f 100644 --- a/src/common/DataStores/DB2FileLoader.h +++ b/src/common/DataStores/DB2FileLoader.h @@ -101,11 +101,11 @@ struct TC_COMMON_API DB2FileSource virtual bool Read(void* buffer, std::size_t numBytes) = 0; // Returns current read position in file - virtual std::size_t GetPosition() const = 0; + virtual int64 GetPosition() const = 0; - virtual bool SetPosition(std::size_t position) = 0; + virtual bool SetPosition(int64 position) = 0; - virtual std::size_t GetFileSize() const = 0; + virtual int64 GetFileSize() const = 0; virtual char const* GetFileName() const = 0; }; diff --git a/src/common/DataStores/DB2FileSystemSource.cpp b/src/common/DataStores/DB2FileSystemSource.cpp index ffbba18f1b2..7c762c35065 100644 --- a/src/common/DataStores/DB2FileSystemSource.cpp +++ b/src/common/DataStores/DB2FileSystemSource.cpp @@ -40,20 +40,20 @@ bool DB2FileSystemSource::Read(void* buffer, std::size_t numBytes) return fread(buffer, numBytes, 1, _file) == 1; } -std::size_t DB2FileSystemSource::GetPosition() const +int64 DB2FileSystemSource::GetPosition() const { return ftell(_file); } -bool DB2FileSystemSource::SetPosition(std::size_t position) +bool DB2FileSystemSource::SetPosition(int64 position) { return fseek(_file, position, SEEK_SET) == 0; } -std::size_t DB2FileSystemSource::GetFileSize() const +int64 DB2FileSystemSource::GetFileSize() const { boost::system::error_code error; - std::size_t size = boost::filesystem::file_size(_fileName, error); + int64 size = boost::filesystem::file_size(_fileName, error); return !error ? size : 0; } diff --git a/src/common/DataStores/DB2FileSystemSource.h b/src/common/DataStores/DB2FileSystemSource.h index 082d1dd8d46..16fe1482eb1 100644 --- a/src/common/DataStores/DB2FileSystemSource.h +++ b/src/common/DataStores/DB2FileSystemSource.h @@ -27,9 +27,9 @@ struct TC_COMMON_API DB2FileSystemSource : public DB2FileSource ~DB2FileSystemSource(); bool IsOpen() const override; bool Read(void* buffer, std::size_t numBytes) override; - std::size_t GetPosition() const override; - bool SetPosition(std::size_t position) override; - std::size_t GetFileSize() const override; + int64 GetPosition() const override; + bool SetPosition(int64 position) override; + int64 GetFileSize() const override; char const* GetFileName() const override; private: |
