Commit 7a18d182 authored by Pranjal Raihan's avatar Pranjal Raihan Committed by Facebook GitHub Bot

Back out "Don't use typeid without RTTI in UniqueInstance"

Reviewed By: prajay

Differential Revision: D29673416

fbshipit-source-id: f08fa89db74198aa648e871837f1f7b841cd8d6b
parent 436e7fd6
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <typeinfo> #include <typeinfo>
#include <folly/CppAttributes.h> #include <folly/CppAttributes.h>
#include <folly/Portability.h>
#include <folly/detail/StaticSingletonManager.h> #include <folly/detail/StaticSingletonManager.h>
namespace folly { namespace folly {
...@@ -28,7 +27,7 @@ namespace detail { ...@@ -28,7 +27,7 @@ namespace detail {
class UniqueInstance { class UniqueInstance {
public: public:
#if !FOLLY_HAS_RTTI || (__GNUC__ && __GNUC__ < 7 && !__clang__) #if __GNUC__ && __GNUC__ < 7 && !__clang__
explicit UniqueInstance(...) noexcept {} explicit UniqueInstance(...) noexcept {}
#else #else
template <template <typename...> class Z, typename... Key, typename... Mapped> template <template <typename...> class Z, typename... Key, typename... Mapped>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment