(wangle) fix after-delete assert

[folly.git] / folly / Traits.h

diff --git a/folly/Traits.h b/folly/Traits.h
index 966dcc578f7355e33cf8e8477c86f70dc67a3d24..2b94df1360effe21828adedb51b864e7d2282116 100644 (file)
--- a/folly/Traits.h
+++ b/folly/Traits.h
@@ -22,11 +22,12 @@
 #include <memory>
 #include <limits>
 #include <type_traits>
+#include <functional>
 
-#include "folly/Portability.h"
+#include <folly/Portability.h>
 
-// libc++ doesn't provide this header
-#if !FOLLY_USE_LIBCPP
+// libc++ doesn't provide this header, nor does msvc
+#ifdef FOLLY_HAVE_BITS_CXXCONFIG_H
 // This file appears in two locations: inside fbcode and in the
 // libstdc++ source code (when embedding fbstring as std::string).
 // To aid in this schizophrenic use, two macros are defined in