Skip to content

Commit 99537c9

Browse files
committed
fix compiler warnings
1 parent cb3f3a3 commit 99537c9

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

ci/travis_before_script_cpp.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,11 @@ source $TRAVIS_BUILD_DIR/ci/travis_env_common.sh
2626
if [ $only_library_mode == "no" ]; then
2727
# C++ toolchain
2828
export CPP_TOOLCHAIN=$TRAVIS_BUILD_DIR/cpp-toolchain
29-
export FLATBUFFERS_HOME=$CPP_TOOLCHAIN
3029
export RAPIDJSON_HOME=$CPP_TOOLCHAIN
3130

3231
# Set up C++ toolchain from conda-forge packages for faster builds
3332
source $TRAVIS_BUILD_DIR/ci/travis_install_conda.sh
34-
conda create -y -q -p $CPP_TOOLCHAIN python=2.7 flatbuffers rapidjson
33+
conda create -y -q -p $CPP_TOOLCHAIN python=2.7 rapidjson
3534
fi
3635

3736
if [ $TRAVIS_OS_NAME == "osx" ]; then

cpp/src/plasma/plasma_store.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,8 @@ void PlasmaStore::return_from_get(GetRequest *get_req) {
248248
void PlasmaStore::update_object_get_requests(ObjectID object_id) {
249249
std::vector<GetRequest *> &get_requests = object_get_requests_[object_id];
250250
size_t index = 0;
251-
int num_requests = get_requests.size();
252-
for (int i = 0; i < num_requests; ++i) {
251+
size_t num_requests = get_requests.size();
252+
for (size_t i = 0; i < num_requests; ++i) {
253253
GetRequest *get_req = get_requests[index];
254254
auto entry = get_object_table_entry(&store_info_, object_id);
255255
ARROW_CHECK(entry != NULL);
@@ -445,9 +445,9 @@ void PlasmaStore::send_notifications(int client_fd) {
445445
int64_t size = *((int64_t *) notification);
446446

447447
// Attempt to send a notification about this object ID.
448-
int nbytes = send(client_fd, notification, sizeof(int64_t) + size, 0);
448+
ssize_t nbytes = send(client_fd, notification, sizeof(int64_t) + size, 0);
449449
if (nbytes >= 0) {
450-
ARROW_CHECK(nbytes == static_cast<int64_t>(sizeof(int64_t)) + size);
450+
ARROW_CHECK(nbytes == static_cast<ssize_t>(sizeof(int64_t)) + size);
451451
} else if (nbytes == -1 &&
452452
(errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR)) {
453453
ARROW_LOG(DEBUG)

0 commit comments

Comments
 (0)