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 /memory/concurrent_arena.cc | |
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 'memory/concurrent_arena.cc')
-rw-r--r-- | memory/concurrent_arena.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/memory/concurrent_arena.cc b/memory/concurrent_arena.cc index 722eb3b60..3333f94db 100644 --- a/memory/concurrent_arena.cc +++ b/memory/concurrent_arena.cc @@ -12,7 +12,7 @@ #include "port/port.h" #include "util/random.h" -namespace rocksdb { +namespace ROCKSDB_NAMESPACE { #ifdef ROCKSDB_SUPPORT_THREAD_LOCAL __thread size_t ConcurrentArena::tls_cpuid = 0; @@ -44,4 +44,4 @@ ConcurrentArena::Shard* ConcurrentArena::Repick() { return shard_and_index.first; } -} // namespace rocksdb +} // namespace ROCKSDB_NAMESPACE |