Make fbstring libgcc-safe

[folly.git] / folly / Traits.h

diff --git a/folly/Traits.h b/folly/Traits.h
index 4d6deeb5628799cc4a61d0964411588586ba8589..bfdf8c708d1fb2c39b9c5e9e308b03e57966dfef 100644 (file)
--- a/folly/Traits.h
+++ b/folly/Traits.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Facebook, Inc.
+ * Copyright 2014 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,11 +22,12 @@
 #include <memory>
 #include <limits>
 #include <type_traits>
+#include <functional>
 
 #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