diff options
| author | matthewvon <matthewv@arangodb.com> | 2020-01-21 16:11:08 -0800 |
|---|---|---|
| committer | Facebook Github Bot <facebook-github-bot@users.noreply.github.com> | 2020-01-21 16:12:43 -0800 |
| commit | e6e8b9e8718698b334d18fa8f5ab6db30b147c53 (patch) | |
| tree | 3ce84a808ec27b169bb82ed8362c086a4265ee74 /db/range_del_aggregator.h | |
| parent | d305f13e2124132863267eb49b2a08ede679d2c4 (diff) | |
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
Diffstat (limited to 'db/range_del_aggregator.h')
| -rw-r--r-- | db/range_del_aggregator.h | 4 |
1 files changed, 2 insertions, 2 deletions
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" |