From e6e8b9e8718698b334d18fa8f5ab6db30b147c53 Mon Sep 17 00:00:00 2001 From: matthewvon Date: Tue, 21 Jan 2020 16:11:08 -0800 Subject: [PATCH] Correct pragma once problem with Bazel on Windows (#6321) Summary: This is a simple edit to have two #include file paths be consistent within range_del_aggregator.{h,cc} with everywhere else. The impact of this inconsistency is that it actual breaks a Bazel based build on the Windows platform. The same pragma once failure occurs with both Windows Visual C++ 2019 and clang for Windows 9.0. Bazel's "sandboxing" of the builds causes both compilers to not properly recognize "rocksdb/types.h" and "include/rocksdb/types.h" to be the same file (also comparator.h). My guess is that the backslash versus forward slash mixing within path names is the underlying issue. But, everything builds fine once the include paths in these two source files are consistent with the rest of the repository. Pull Request resolved: https://github.com/facebook/rocksdb/pull/6321 Differential Revision: D19506585 Pulled By: ltamasi fbshipit-source-id: 294c346607edc433ab99eaabc9c880ee7426817a --- db/range_del_aggregator.cc | 4 ++-- db/range_del_aggregator.h | 4 ++-- utilities/persistent_cache/block_cache_tier_file_buffer.h | 2 +- utilities/persistent_cache/hash_table.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/db/range_del_aggregator.cc b/db/range_del_aggregator.cc index 7c188aeaa..c8d33ffb3 100644 --- a/db/range_del_aggregator.cc +++ b/db/range_del_aggregator.cc @@ -11,8 +11,8 @@ #include "db/range_del_aggregator.h" #include "db/range_tombstone_fragmenter.h" #include "db/version_edit.h" -#include "include/rocksdb/comparator.h" -#include "include/rocksdb/types.h" +#include "rocksdb/comparator.h" +#include "rocksdb/types.h" #include "table/internal_iterator.h" #include "table/scoped_arena_iterator.h" #include "table/table_builder.h" diff --git a/db/range_del_aggregator.h b/db/range_del_aggregator.h index 96cfb5813..c68d75d7f 100644 --- a/db/range_del_aggregator.h +++ b/db/range_del_aggregator.h @@ -19,8 +19,8 @@ #include "db/range_del_aggregator.h" #include "db/range_tombstone_fragmenter.h" #include "db/version_edit.h" -#include "include/rocksdb/comparator.h" -#include "include/rocksdb/types.h" +#include "rocksdb/comparator.h" +#include "rocksdb/types.h" #include "table/internal_iterator.h" #include "table/scoped_arena_iterator.h" #include "table/table_builder.h" diff --git a/utilities/persistent_cache/block_cache_tier_file_buffer.h b/utilities/persistent_cache/block_cache_tier_file_buffer.h index e4f8f5ba4..dd8c83f43 100644 --- a/utilities/persistent_cache/block_cache_tier_file_buffer.h +++ b/utilities/persistent_cache/block_cache_tier_file_buffer.h @@ -8,7 +8,7 @@ #include #include -#include "include/rocksdb/comparator.h" +#include "rocksdb/comparator.h" #include "memory/arena.h" #include "util/mutexlock.h" diff --git a/utilities/persistent_cache/hash_table.h b/utilities/persistent_cache/hash_table.h index 36d8327e2..874495a7b 100644 --- a/utilities/persistent_cache/hash_table.h +++ b/utilities/persistent_cache/hash_table.h @@ -15,7 +15,7 @@ #include #endif -#include "include/rocksdb/env.h" +#include "rocksdb/env.h" #include "util/mutexlock.h" namespace rocksdb {