options: Forward declare WriteBufferManager (#279)

There is a circular dependency between options.h and write_buffer_manager.h. In order to fix that, I forward declare the WriteBufferManager class in options.h and include it in options.cc and in other .cc files which use WriteBufferManager.
speedb-io · May 2, 2023 · 8772bfc · 8772bfc
1 parent ade5c48
commit 8772bfc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/include/rocksdb/options.h b/include/rocksdb/options.h
@@ -29,7 +29,6 @@
 #include "rocksdb/types.h"
 #include "rocksdb/universal_compaction.h"
 #include "rocksdb/version.h"
-#include "rocksdb/write_buffer_manager.h"
 
 #ifdef max
 #undef max
@@ -55,6 +54,7 @@ class Slice;
 class Statistics;
 class InternalKeyComparator;
 class WalFilter;
+class WriteBufferManager;
 class FileSystem;
 class WriteController;
 

diff --git a/options/db_options.cc b/options/db_options.cc
@@ -23,6 +23,7 @@
 #include "rocksdb/system_clock.h"
 #include "rocksdb/utilities/options_type.h"
 #include "rocksdb/wal_filter.h"
+#include "rocksdb/write_buffer_manager.h"
 #include "util/string_util.h"
 
 namespace ROCKSDB_NAMESPACE {

diff --git a/options/options.cc b/options/options.cc
@@ -30,6 +30,7 @@
 #include "rocksdb/table.h"
 #include "rocksdb/table_properties.h"
 #include "rocksdb/wal_filter.h"
+#include "rocksdb/write_buffer_manager.h"
 #include "table/block_based/block_based_table_factory.h"
 #include "util/compression.h"