From 21d8c317966fb3ad0bae8cc03f16c505f2c0792f Mon Sep 17 00:00:00 2001 From: Maysam Yabandeh Date: Mon, 20 Mar 2017 12:52:20 -0700 Subject: [PATCH] remove LIKELY from public headers Summary: Fixes #2008 Closes https://github.com/facebook/rocksdb/pull/2009 Differential Revision: D4739885 Pulled By: maysamyabandeh fbshipit-source-id: 36fba5d --- include/rocksdb/db.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/rocksdb/db.h b/include/rocksdb/db.h index e74f7adef..e5791fbc6 100644 --- a/include/rocksdb/db.h +++ b/include/rocksdb/db.h @@ -16,7 +16,6 @@ #include #include #include -#include "port/likely.h" #include "rocksdb/iterator.h" #include "rocksdb/listener.h" #include "rocksdb/metadata.h" @@ -288,7 +287,7 @@ class DB { PinnableSlice pinnable_val(value); assert(!pinnable_val.IsPinned()); 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()); } // else value is already assigned return s;