From f08ee8d3de5f313e9d07631f7756190b2fb6cd3f Mon Sep 17 00:00:00 2001 From: anand76 Date: Thu, 7 May 2020 15:52:58 -0700 Subject: [PATCH] Include options.h in table.h (#6823) Summary: https://github.com/facebook/rocksdb/issues/6389 replaced the #include of options.h in table.h with forward declarations, which is causing some build failures in RocksDB users in 6.10. Remove the forward declarations and #include options.h as recommended by the style guide - https://google.github.io/styleguide/cppguide.html#Forward_Declarations Pull Request resolved: https://github.com/facebook/rocksdb/pull/6823 Reviewed By: riversand963 Differential Revision: D21464078 Pulled By: anand1976 fbshipit-source-id: 6033ee2544d279690f57bb0db91bc83816cee11d --- include/rocksdb/table.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/rocksdb/table.h b/include/rocksdb/table.h index 86a6e1d65..47bf60e8f 100644 --- a/include/rocksdb/table.h +++ b/include/rocksdb/table.h @@ -25,6 +25,7 @@ #include "rocksdb/cache.h" #include "rocksdb/env.h" #include "rocksdb/iterator.h" +#include "rocksdb/options.h" #include "rocksdb/status.h" namespace ROCKSDB_NAMESPACE { @@ -40,11 +41,8 @@ class TableBuilder; class TableFactory; class TableReader; class WritableFileWriter; -struct ColumnFamilyOptions; struct ConfigOptions; -struct DBOptions; struct EnvOptions; -struct Options; enum ChecksumType : char { kNoChecksum = 0x0,