diff options
| author | sdong <siying.d@fb.com> | 2020-02-20 12:07:53 -0800 |
|---|---|---|
| committer | Facebook Github Bot <facebook-github-bot@users.noreply.github.com> | 2020-02-20 12:09:57 -0800 |
| commit | fdf882ded218344c136c97daf76dfb59e4bc155f (patch) | |
| tree | 00237d163251ff53a7fe8cb7fbd5d7462fbc9e32 /db/logs_with_prep_tracker.h | |
| parent | 4e33f1e1dc40be18f8233a913324b2978c6a46fa (diff) | |
Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433)
Summary:
When dynamically linking two binaries together, different builds of RocksDB from two sources might cause errors. To provide a tool for user to solve the problem, the RocksDB namespace is changed to a flag which can be overridden in build time.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6433
Test Plan: Build release, all and jtest. Try to build with ROCKSDB_NAMESPACE with another flag.
Differential Revision: D19977691
fbshipit-source-id: aa7f2d0972e1c31d75339ac48478f34f6cfcfb3e
Diffstat (limited to 'db/logs_with_prep_tracker.h')
| -rw-r--r-- | db/logs_with_prep_tracker.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/db/logs_with_prep_tracker.h b/db/logs_with_prep_tracker.h index 639d8f806..86c88012a 100644 --- a/db/logs_with_prep_tracker.h +++ b/db/logs_with_prep_tracker.h @@ -12,7 +12,9 @@ #include <unordered_map> #include <vector> -namespace rocksdb { +#include "rocksdb/rocksdb_namespace.h" + +namespace ROCKSDB_NAMESPACE { // This class is used to track the log files with outstanding prepare entries. class LogsWithPrepTracker { @@ -58,4 +60,4 @@ class LogsWithPrepTracker { std::mutex prepared_section_completed_mutex_; }; -} // namespace rocksdb +} // namespace ROCKSDB_NAMESPACE |