andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove LIKELY from public headers

Browse Source 
Summary:
Fixes #2008
Closes https://github.com/facebook/rocksdb/pull/2009

Differential Revision: D4739885

Pulled By: maysamyabandeh

fbshipit-source-id: 36fba5d
This commit is contained in:
Maysam Yabandeh 2017-03-20 12:52:20 -07:00 committed by Facebook Github Bot
parent 36ad75778b
commit 21d8c31796
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/rocksdb/db.h
View File

@ -16,7 +16,6 @@
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include "port/likely.h"
#include "rocksdb/iterator.h" #include "rocksdb/iterator.h"
#include "rocksdb/listener.h" #include "rocksdb/listener.h"
#include "rocksdb/metadata.h" #include "rocksdb/metadata.h"
@ -288,7 +287,7 @@ class DB {
PinnableSlice pinnable_val(value); PinnableSlice pinnable_val(value);
assert(!pinnable_val.IsPinned()); assert(!pinnable_val.IsPinned());
auto s = Get(options, column_family, key, &pinnable_val); auto s = Get(options, column_family, key, &pinnable_val);
if (LIKELY(s.ok()) && pinnable_val.IsPinned()) { if (s.ok() && pinnable_val.IsPinned()) {
value->assign(pinnable_val.data(), pinnable_val.size()); value->assign(pinnable_val.data(), pinnable_val.size());
} // else value is already assigned } // else value is already assigned
return s; return s;