gcc-7 requires include <functional> for std::function

Summary:
Fixes compile error:

In file included from ./util/statistics.h:17:0,
                 from ./util/stop_watch.h:8,
                 from ./util/perf_step_timer.h:9,
                 from ./util/iostats_context_imp.h:8,
                 from ./util/posix_logger.h:27,
                 from ./port/util_logger.h:18,
                 from ./db/auto_roll_logger.h:15,
                 from db/auto_roll_logger.cc:6:
./util/thread_local.h:65:16: error: 'function' in namespace 'std' does not name a template type
   typedef std::function<void(void*, void*)> FoldFunc;
Closes https://github.com/facebook/rocksdb/pull/1656

Differential Revision: D4318702

Pulled By: yiwu-arbug

fbshipit-source-id: 8c5d17a
main
Daniel Black 8 years ago committed by Facebook Github Bot
parent c270735861
commit 816c1e30ca
  1. 2
      db/db_iterator_test.cc
  2. 2
      db/external_sst_file_test.cc
  3. 3
      db/file_indexer.cc
  4. 1
      db/version_builder.cc
  5. 1
      db/write_callback_test.cc
  6. 1
      include/rocksdb/env.h
  7. 1
      java/rocksjni/portal.h
  8. 3
      java/rocksjni/rocksjni.cc
  9. 3
      tools/ldb_cmd.cc
  10. 3
      util/dynamic_bloom_test.cc
  11. 1
      util/fault_injection_test_env.cc
  12. 1
      util/sync_point.cc
  13. 1
      util/sync_point.h
  14. 1
      util/thread_local.h
  15. 1
      util/xfunc.h
  16. 1
      utilities/backupable/backupable_db.cc
  17. 1
      utilities/persistent_cache/block_cache_tier_file.cc
  18. 2
      utilities/persistent_cache/hash_table_evictable.h
  19. 1
      utilities/transactions/optimistic_transaction_test.cc
  20. 1
      utilities/transactions/transaction_test.cc

@ -7,6 +7,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. See the AUTHORS file for names of contributors. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#include <functional>
#include "db/db_test_util.h" #include "db/db_test_util.h"
#include "port/port.h" #include "port/port.h"
#include "port/stack_trace.h" #include "port/stack_trace.h"

@ -3,6 +3,8 @@
// LICENSE file in the root directory of this source tree. An additional grant // LICENSE file in the root directory of this source tree. An additional grant
// of patent rights can be found in the PATENTS file in the same directory. // of patent rights can be found in the PATENTS file in the same directory.
#include <functional>
#include "db/db_test_util.h" #include "db/db_test_util.h"
#include "port/port.h" #include "port/port.h"
#include "port/stack_trace.h" #include "port/stack_trace.h"

@ -9,8 +9,9 @@
#include "db/file_indexer.h" #include "db/file_indexer.h"
#include <algorithm> #include <algorithm>
#include "rocksdb/comparator.h" #include <functional>
#include "db/version_edit.h" #include "db/version_edit.h"
#include "rocksdb/comparator.h"
namespace rocksdb { namespace rocksdb {

@ -16,6 +16,7 @@
#include <inttypes.h> #include <inttypes.h>
#include <algorithm> #include <algorithm>
#include <atomic> #include <atomic>
#include <functional>
#include <set> #include <set>
#include <thread> #include <thread>
#include <unordered_map> #include <unordered_map>

@ -5,6 +5,7 @@
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#include <functional>
#include <string> #include <string>
#include <utility> #include <utility>
#include <vector> #include <vector>

@ -19,6 +19,7 @@
#include <stdint.h> #include <stdint.h>
#include <cstdarg> #include <cstdarg>
#include <functional>
#include <limits> #include <limits>
#include <memory> #include <memory>
#include <string> #include <string>

@ -11,6 +11,7 @@
#define JAVA_ROCKSJNI_PORTAL_H_ #define JAVA_ROCKSJNI_PORTAL_H_
#include <jni.h> #include <jni.h>
#include <functional>
#include <limits> #include <limits>
#include <string> #include <string>
#include <vector> #include <vector>

@ -9,11 +9,12 @@
#include <jni.h> #include <jni.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <algorithm>
#include <functional>
#include <memory> #include <memory>
#include <string> #include <string>
#include <tuple> #include <tuple>
#include <vector> #include <vector>
#include <algorithm>
#include "include/org_rocksdb_RocksDB.h" #include "include/org_rocksdb_RocksDB.h"
#include "rocksdb/cache.h" #include "rocksdb/cache.h"

@ -34,12 +34,13 @@
#include <cstdlib> #include <cstdlib>
#include <ctime> #include <ctime>
#include <fstream>
#include <functional>
#include <iostream> #include <iostream>
#include <limits> #include <limits>
#include <sstream> #include <sstream>
#include <stdexcept> #include <stdexcept>
#include <string> #include <string>
#include <fstream>
namespace rocksdb { namespace rocksdb {

@ -15,13 +15,14 @@ int main() {
#define __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS
#endif #endif
#include <gflags/gflags.h>
#include <inttypes.h> #include <inttypes.h>
#include <algorithm> #include <algorithm>
#include <atomic> #include <atomic>
#include <functional>
#include <memory> #include <memory>
#include <thread> #include <thread>
#include <vector> #include <vector>
#include <gflags/gflags.h>
#include "dynamic_bloom.h" #include "dynamic_bloom.h"
#include "port/port.h" #include "port/port.h"

@ -12,6 +12,7 @@
// file data (or entire files) not protected by a "sync". // file data (or entire files) not protected by a "sync".
#include "util/fault_injection_test_env.h" #include "util/fault_injection_test_env.h"
#include <functional>
#include <utility> #include <utility>
namespace rocksdb { namespace rocksdb {

@ -4,6 +4,7 @@
// of patent rights can be found in the PATENTS file in the same directory. // of patent rights can be found in the PATENTS file in the same directory.
#include "util/sync_point.h" #include "util/sync_point.h"
#include <functional>
#include <thread> #include <thread>
#include "port/port.h" #include "port/port.h"
#include "util/random.h" #include "util/random.h"

@ -6,6 +6,7 @@
#include <assert.h> #include <assert.h>
#include <condition_variable> #include <condition_variable>
#include <functional>
#include <mutex> #include <mutex>
#include <string> #include <string>
#include <thread> #include <thread>

@ -10,6 +10,7 @@
#pragma once #pragma once
#include <atomic> #include <atomic>
#include <functional>
#include <memory> #include <memory>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>

@ -5,6 +5,7 @@
#pragma once #pragma once
#include <cstdlib> #include <cstdlib>
#include <functional>
#include <string> #include <string>
#include "rocksdb/options.h" #include "rocksdb/options.h"

@ -30,6 +30,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <algorithm> #include <algorithm>
#include <atomic> #include <atomic>
#include <functional>
#include <future> #include <future>
#include <limits> #include <limits>
#include <map> #include <map>

@ -9,6 +9,7 @@
#ifndef OS_WIN #ifndef OS_WIN
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <functional>
#include <memory> #include <memory>
#include <vector> #include <vector>

@ -7,6 +7,8 @@
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#include <functional>
#include "util/random.h" #include "util/random.h"
#include "utilities/persistent_cache/hash_table.h" #include "utilities/persistent_cache/hash_table.h"
#include "utilities/persistent_cache/lrulist.h" #include "utilities/persistent_cache/lrulist.h"

@ -5,6 +5,7 @@
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#include <functional>
#include <string> #include <string>
#include <thread> #include <thread>

@ -6,6 +6,7 @@
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#include <algorithm> #include <algorithm>
#include <functional>
#include <string> #include <string>
#include <thread> #include <thread>

Loading…
Cancel
Save