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/pinned_iterators_manager.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/pinned_iterators_manager.h')
| -rw-r--r-- | db/pinned_iterators_manager.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/db/pinned_iterators_manager.h b/db/pinned_iterators_manager.h index 7874eef6d..5e8ad51dd 100644 --- a/db/pinned_iterators_manager.h +++ b/db/pinned_iterators_manager.h @@ -11,7 +11,7 @@ #include "table/internal_iterator.h" -namespace rocksdb { +namespace ROCKSDB_NAMESPACE { // PinnedIteratorsManager will be notified whenever we need to pin an Iterator // and it will be responsible for deleting pinned Iterators when they are @@ -84,4 +84,4 @@ class PinnedIteratorsManager : public Cleanable { std::vector<std::pair<void*, ReleaseFunction>> pinned_ptrs_; }; -} // namespace rocksdb +} // namespace ROCKSDB_NAMESPACE |