From ab8129ab8af3cc7ae7a01bdcb0c6fdb59eee030d Mon Sep 17 00:00:00 2001 From: Yi Wu Date: Mon, 15 May 2017 13:40:32 -0700 Subject: [PATCH] Fix build error with blob DB. Summary: snprintf is in and not in namespace std. Closes https://github.com/facebook/rocksdb/pull/2287 Reviewed By: anirbanr-fb Differential Revision: D5054752 Pulled By: yiwu-arbug fbshipit-source-id: 356807ec38f3c7d95951cdb41f31a3d3ae0714d4 --- CMakeLists.txt | 1 - Makefile | 3 --- TARGETS | 1 - src.mk | 1 - utilities/blob_db/blob_file.cc | 1 + 5 files changed, 1 insertion(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2477fcbb9..c4e84c94f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -655,7 +655,6 @@ set(TESTS util/thread_list_test.cc util/thread_local_test.cc utilities/backupable/backupable_db_test.cc - utilities/blob_db/blob_db_test.cc utilities/checkpoint/checkpoint_test.cc utilities/column_aware_encoding_test.cc utilities/date_tiered/date_tiered_test.cc diff --git a/Makefile b/Makefile index 87a507564..c53890eb7 100644 --- a/Makefile +++ b/Makefile @@ -1075,9 +1075,6 @@ prefix_test: db/prefix_test.o $(LIBOBJECTS) $(TESTHARNESS) backupable_db_test: utilities/backupable/backupable_db_test.o $(LIBOBJECTS) $(TESTHARNESS) $(AM_LINK) -blob_db_test: utilities/blob_db/blob_db_test.o $(LIBOBJECTS) $(TESTHARNESS) - $(AM_LINK) - checkpoint_test: utilities/checkpoint/checkpoint_test.o $(LIBOBJECTS) $(TESTHARNESS) $(AM_LINK) diff --git a/TARGETS b/TARGETS index 365cbaa13..2f464316a 100644 --- a/TARGETS +++ b/TARGETS @@ -325,7 +325,6 @@ ROCKS_TESTS = [['merger_test', 'table/merger_test.cc', 'serial'], ['compact_files_test', 'db/compact_files_test.cc', 'serial'], ['db_options_test', 'db/db_options_test.cc', 'serial'], ['object_registry_test', 'utilities/object_registry_test.cc', 'serial'], - ['blob_db_test', 'utilities/blob_db/blob_db_test.cc', 'serial'], ['auto_roll_logger_test', 'util/auto_roll_logger_test.cc', 'serial'], ['dbformat_test', 'db/dbformat_test.cc', 'serial'], ['write_batch_with_index_test', diff --git a/src.mk b/src.mk index e0b5b59a0..9bc4fc27d 100644 --- a/src.mk +++ b/src.mk @@ -317,7 +317,6 @@ MAIN_SOURCES = \ util/thread_list_test.cc \ util/thread_local_test.cc \ utilities/backupable/backupable_db_test.cc \ - utilities/blob_db/blob_db_test.cc \ utilities/checkpoint/checkpoint_test.cc \ utilities/column_aware_encoding_exp.cc \ utilities/column_aware_encoding_test.cc \ diff --git a/utilities/blob_db/blob_file.cc b/utilities/blob_db/blob_file.cc index 5c8d6864f..a1a0a16e8 100644 --- a/utilities/blob_db/blob_file.cc +++ b/utilities/blob_db/blob_file.cc @@ -6,6 +6,7 @@ #include #include +#include #include #include "utilities/blob_db/blob_db_impl.h"