Include C++ standard library headers instead of C compatibility headers (#8068)

Summary: Pull Request resolved: https://github.com/facebook/rocksdb/pull/8068

Reviewed By: zhichao-cao

Differential Revision: D27147685

Pulled By: riversand963

fbshipit-source-id: 5428b1c0142ecae17c977fba31a6d49b52983d1c
main
storagezhang 4 years ago committed by Facebook GitHub Bot
parent c706324208
commit d9be6556aa
  1. 2
      cache/cache_bench.cc
  2. 4
      cache/lru_cache.cc
  3. 12
      db/c.cc
  4. 3
      db/db_iter.h
  5. 3
      db/flush_scheduler.h
  6. 3
      db/log_writer.h
  7. 2
      db/logs_with_prep_tracker.h
  8. 5
      db/range_tombstone_fragmenter.cc
  9. 2
      db/table_cache.h
  10. 3
      db/version_set.cc
  11. 4
      db/write_thread.h

@ -11,10 +11,10 @@ int main() {
} }
#else #else
#include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
#include <cinttypes> #include <cinttypes>
#include <cstdio>
#include <limits> #include <limits>
#include "port/port.h" #include "port/port.h"

@ -9,8 +9,8 @@
#include "cache/lru_cache.h" #include "cache/lru_cache.h"
#include <assert.h> #include <cassert>
#include <stdio.h> #include <cstdio>
#include <string> #include <string>
#include "util/mutexlock.h" #include "util/mutexlock.h"

@ -11,7 +11,11 @@
#include "rocksdb/c.h" #include "rocksdb/c.h"
#include <stdlib.h> #include <cstdlib>
#include <map>
#include <unordered_set>
#include <vector>
#include "port/port.h" #include "port/port.h"
#include "rocksdb/cache.h" #include "rocksdb/cache.h"
#include "rocksdb/compaction_filter.h" #include "rocksdb/compaction_filter.h"
@ -24,6 +28,7 @@
#include "rocksdb/memtablerep.h" #include "rocksdb/memtablerep.h"
#include "rocksdb/merge_operator.h" #include "rocksdb/merge_operator.h"
#include "rocksdb/options.h" #include "rocksdb/options.h"
#include "rocksdb/perf_context.h"
#include "rocksdb/rate_limiter.h" #include "rocksdb/rate_limiter.h"
#include "rocksdb/slice_transform.h" #include "rocksdb/slice_transform.h"
#include "rocksdb/statistics.h" #include "rocksdb/statistics.h"
@ -39,13 +44,8 @@
#include "rocksdb/utilities/transaction_db.h" #include "rocksdb/utilities/transaction_db.h"
#include "rocksdb/utilities/write_batch_with_index.h" #include "rocksdb/utilities/write_batch_with_index.h"
#include "rocksdb/write_batch.h" #include "rocksdb/write_batch.h"
#include "rocksdb/perf_context.h"
#include "utilities/merge_operators.h" #include "utilities/merge_operators.h"
#include <vector>
#include <unordered_set>
#include <map>
using ROCKSDB_NAMESPACE::BackupableDBOptions; using ROCKSDB_NAMESPACE::BackupableDBOptions;
using ROCKSDB_NAMESPACE::BackupEngine; using ROCKSDB_NAMESPACE::BackupEngine;
using ROCKSDB_NAMESPACE::BackupID; using ROCKSDB_NAMESPACE::BackupID;

@ -8,8 +8,9 @@
// 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.
#pragma once #pragma once
#include <stdint.h> #include <cstdint>
#include <string> #include <string>
#include "db/db_impl/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/dbformat.h" #include "db/dbformat.h"
#include "db/range_del_aggregator.h" #include "db/range_del_aggregator.h"

@ -5,10 +5,11 @@
#pragma once #pragma once
#include <stdint.h>
#include <atomic> #include <atomic>
#include <cstdint>
#include <mutex> #include <mutex>
#include <set> #include <set>
#include "util/autovector.h" #include "util/autovector.h"
namespace ROCKSDB_NAMESPACE { namespace ROCKSDB_NAMESPACE {

@ -8,8 +8,7 @@
// 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.
#pragma once #pragma once
#include <stdint.h> #include <cstdint>
#include <memory> #include <memory>
#include "db/log_format.h" #include "db/log_format.h"

@ -5,8 +5,8 @@
// //
#pragma once #pragma once
#include <stdint.h>
#include <cassert> #include <cassert>
#include <cstdint>
#include <cstdlib> #include <cstdlib>
#include <mutex> #include <mutex>
#include <unordered_map> #include <unordered_map>

@ -6,12 +6,11 @@
#include "db/range_tombstone_fragmenter.h" #include "db/range_tombstone_fragmenter.h"
#include <algorithm> #include <algorithm>
#include <cinttypes>
#include <cstdio>
#include <functional> #include <functional>
#include <set> #include <set>
#include <stdio.h>
#include <cinttypes>
#include "util/autovector.h" #include "util/autovector.h"
#include "util/kv_map.h" #include "util/kv_map.h"
#include "util/vector_iterator.h" #include "util/vector_iterator.h"

@ -10,9 +10,9 @@
// Thread-safe (provides internal synchronization) // Thread-safe (provides internal synchronization)
#pragma once #pragma once
#include <cstdint>
#include <string> #include <string>
#include <vector> #include <vector>
#include <stdint.h>
#include "db/dbformat.h" #include "db/dbformat.h"
#include "db/range_del_aggregator.h" #include "db/range_del_aggregator.h"

@ -9,11 +9,10 @@
#include "db/version_set.h" #include "db/version_set.h"
#include <stdio.h>
#include <algorithm> #include <algorithm>
#include <array> #include <array>
#include <cinttypes> #include <cinttypes>
#include <cstdio>
#include <list> #include <list>
#include <map> #include <map>
#include <set> #include <set>

@ -5,11 +5,11 @@
#pragma once #pragma once
#include <assert.h>
#include <stdint.h>
#include <atomic> #include <atomic>
#include <cassert>
#include <chrono> #include <chrono>
#include <condition_variable> #include <condition_variable>
#include <cstdint>
#include <mutex> #include <mutex>
#include <type_traits> #include <type_traits>
#include <vector> #include <vector>

Loading…
Cancel
Save