Skip to content

ORC-1973: [C++] Use int64_t instead of google::protobuf::int64 for Protobuf v22+ #2357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dongjoon-hyun wants to merge 1 commit into from
Closed

ORC-1973: [C++] Use int64_t instead of google::protobuf::int64 for Protobuf v22+ #2357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions c++/src/io/InputStream.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ namespace orc {
return false;
}

google::protobuf::int64 SeekableArrayInputStream::ByteCount() const {
return static_cast<google::protobuf::int64>(position_);
int64_t SeekableArrayInputStream::ByteCount() const {
return static_cast<int64_t>(position_);
}

void SeekableArrayInputStream::seek(PositionProvider& seekPosition) {
Expand Down
2 changes: 1 addition & 1 deletion c++/src/io/InputStream.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ namespace orc {
virtual bool Next(const void** data, int* size) override;
virtual void BackUp(int count) override;
virtual bool Skip(int count) override;
virtual google::protobuf::int64 ByteCount() const override;
virtual int64_t ByteCount() const override;
virtual void seek(PositionProvider& position) override;
virtual std::string getName() const override;
};
Expand Down
4 changes: 2 additions & 2 deletions c++/src/io/OutputStream.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ namespace orc {
// PASS
}

google::protobuf::int64 BufferedOutputStream::ByteCount() const {
return static_cast<google::protobuf::int64>(dataBuffer_->size());
int64_t BufferedOutputStream::ByteCount() const {
return static_cast<int64_t>(dataBuffer_->size());
}

bool BufferedOutputStream::WriteAliasedRaw(const void*, int) {
Expand Down
2 changes: 1 addition & 1 deletion c++/src/io/OutputStream.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ namespace orc {

virtual bool Next(void** data, int* size) override;
virtual void BackUp(int count) override;
virtual google::protobuf::int64 ByteCount() const override;
virtual int64_t ByteCount() const override;
virtual bool WriteAliasedRaw(const void* data, int size) override;
virtual bool AllowsAliasing() const override;

Expand Down
Loading