/*
- * Copyright 2016 Facebook, Inc.
+ * Copyright 2017 Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include <exception>
#include <stdarg.h>
#include <string>
+#include <vector>
#include <boost/type_traits.hpp>
#include <boost/regex/pending/unicode_iterator.hpp>
-#ifdef FOLLY_HAVE_DEPRECATED_ASSOC
-#ifdef _GLIBCXX_SYMVER
-#include <ext/hash_set>
-#include <ext/hash_map>
-#endif
-#endif
-
#include <unordered_set>
#include <unordered_map>
#include <folly/Conv.h>
-#include <folly/Demangle.h>
+#include <folly/ExceptionString.h>
#include <folly/FBString.h>
#include <folly/FBVector.h>
#include <folly/Portability.h>
*/
fbstring errnoStr(int err);
-/**
- * Debug string for an exception: include type and what(), if
- * defined.
- */
-inline fbstring exceptionStr(const std::exception& e) {
-#ifdef FOLLY_HAS_RTTI
- return folly::to<fbstring>(demangle(typeid(e)), ": ", e.what());
-#else
- return folly::to<fbstring>("Exception (no RTTI available): ", e.what());
-#endif
-}
-
-// Empirically, this indicates if the runtime supports
-// std::exception_ptr, as not all (arm, for instance) do.
-#if defined(__GNUC__) && defined(__GCC_ATOMIC_INT_LOCK_FREE) && \
- __GCC_ATOMIC_INT_LOCK_FREE > 1
-inline fbstring exceptionStr(std::exception_ptr ep) {
- try {
- std::rethrow_exception(ep);
- } catch (const std::exception& e) {
- return exceptionStr(e);
- } catch (...) {
- return "<unknown exception>";
- }
-}
-#endif
-
-template<typename E>
-auto exceptionStr(const E& e)
- -> typename std::enable_if<!std::is_base_of<std::exception, E>::value,
- fbstring>::type
-{
-#ifdef FOLLY_HAS_RTTI
- return folly::to<fbstring>(demangle(typeid(e)));
-#else
- return "Exception (no RTTI available)";
-#endif
-}
-
/*
* Split a string into a list of tokens by delimiter.
*
template <class T>
struct IsConvertible<
T,
- decltype(parseTo(std::declval<folly::StringPiece>(), std::declval<T&>()))> {
+ decltype(static_cast<void>(
+ parseTo(std::declval<folly::StringPiece>(), std::declval<T&>())))> {
enum { value = true };
};
} // namespace folly
-// Hook into boost's type traits
-namespace boost {
-template <class T>
-struct has_nothrow_constructor<folly::basic_fbstring<T> > : true_type {
- enum { value = true };
-};
-} // namespace boost
-
#include <folly/String-inl.h>