Commit 500f3598 authored by Marcus Holland-Moritz's avatar Marcus Holland-Moritz Committed by Facebook Github Bot 4

Get rid of circular dependency when including ExceptionWrapper.h from Conv.h

Summary:
This is needed in order to be able to use folly::Try<> with folly::to<> for
non-throwing conversions.

Reviewed By: meyering

Differential Revision: D3411003

fbshipit-source-id: 1f20e7871b9cedda2b35527dac70381579abd708
parent 1228a37d
/*
* Copyright 2016 Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#pragma once
#include <exception>
#include <string>
#include <type_traits>
#include <folly/Demangle.h>
#include <folly/FBString.h>
#include <folly/Portability.h>
namespace folly {
/**
* Debug string for an exception: include type and what(), if
* defined.
*/
inline fbstring exceptionStr(const std::exception& e) {
#ifdef FOLLY_HAS_RTTI
fbstring rv(demangle(typeid(e)));
rv += ": ";
#else
fbstring rv("Exception (no RTTI available): ");
#endif
rv += e.what();
return rv;
}
// 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 demangle(typeid(e));
#else
return "Exception (no RTTI available)";
#endif
}
} // namespace folly
......@@ -19,7 +19,7 @@
#include <cassert>
#include <exception>
#include <memory>
#include <folly/String.h>
#include <folly/ExceptionString.h>
#include <folly/detail/ExceptionWrapper.h>
namespace folly {
......
......@@ -83,6 +83,7 @@ nobase_follyinclude_HEADERS = \
dynamic.h \
dynamic-inl.h \
Exception.h \
ExceptionString.h \
ExceptionWrapper.h \
Executor.h \
EvictingCacheMap.h \
......
......@@ -34,7 +34,7 @@
#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>
......@@ -386,45 +386,6 @@ std::string hexDump(const void* ptr, size_t size);
*/
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.
*
......
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