From 0d6a706bc02b6fbca58d2f5f711c4505fb2ad38a Mon Sep 17 00:00:00 2001 From: Christopher Dykes Date: Mon, 12 Dec 2016 11:46:03 -0800 Subject: [PATCH] Allow building with -Wgnu-conditional-omitted-operand Summary: Which warns about the use of a ternary statement with the first operand omitted. This is a GCC extension and MSVC does not support it, so eliminate the last use of it. Reviewed By: yfeldblum Differential Revision: D4309989 fbshipit-source-id: 04c968708e47f8cb707fd0892e8780bc676df0de --- folly/experimental/symbolizer/Symbolizer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/folly/experimental/symbolizer/Symbolizer.cpp b/folly/experimental/symbolizer/Symbolizer.cpp index 49451104..e6f9ce9c 100644 --- a/folly/experimental/symbolizer/Symbolizer.cpp +++ b/folly/experimental/symbolizer/Symbolizer.cpp @@ -78,7 +78,7 @@ void SymbolizedFrame::set(const std::shared_ptr& file, } Symbolizer::Symbolizer(ElfCacheBase* cache, Dwarf::LocationInfoMode mode) - : cache_(cache ?: defaultElfCache()), mode_(mode) { + : cache_(cache ? cache : defaultElfCache()), mode_(mode) { } void Symbolizer::symbolize(const uintptr_t* addresses, -- 2.34.1