Commit 0df06cbe authored by Yedidya Feldblum's avatar Yedidya Feldblum Committed by Facebook GitHub Bot

Outline exceptionStr function bodies

Summary: [Folly] Outline `exceptionStr` function bodies and move them to the `.cpp`.

Reviewed By: ot, luciang

Differential Revision: D22529702

fbshipit-source-id: 165c14009f224e86e63b3a3126c8b837cf3793f5
parent ab1c217f
/*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* 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.
*/
#include <folly/ExceptionString.h>
namespace folly {
/**
* Debug string for an exception: include type and what(), if
* defined.
*/
fbstring exceptionStr(const std::exception& e) {
#if FOLLY_HAS_RTTI
fbstring rv(demangle(typeid(e)));
rv += ": ";
#else
fbstring rv("Exception (no RTTI available): ");
#endif
rv += e.what();
return rv;
}
fbstring exceptionStr(std::exception_ptr ep) {
if (!kHasExceptions) {
return "Exception (catch unavailable)";
}
return catch_exception(
[&]() -> fbstring {
return catch_exception<std::exception const&>(
[&]() -> fbstring { std::rethrow_exception(ep); },
[](auto&& e) { return exceptionStr(e); });
},
[]() -> fbstring { return "<unknown exception>"; });
}
} // namespace folly
...@@ -30,29 +30,9 @@ namespace folly { ...@@ -30,29 +30,9 @@ namespace folly {
* Debug string for an exception: include type and what(), if * Debug string for an exception: include type and what(), if
* defined. * defined.
*/ */
inline fbstring exceptionStr(const std::exception& e) { fbstring exceptionStr(const std::exception& e);
#if FOLLY_HAS_RTTI
fbstring rv(demangle(typeid(e)));
rv += ": ";
#else
fbstring rv("Exception (no RTTI available): ");
#endif
rv += e.what();
return rv;
}
inline fbstring exceptionStr(std::exception_ptr ep) { fbstring exceptionStr(std::exception_ptr ep);
if (!kHasExceptions) {
return "Exception (catch unavailable)";
}
return catch_exception(
[&]() -> fbstring {
return catch_exception<std::exception const&>(
[&]() -> fbstring { std::rethrow_exception(ep); },
[](auto&& e) { return exceptionStr(e); });
},
[]() -> fbstring { return "<unknown exception>"; });
}
template <typename E> template <typename E>
auto exceptionStr(const E& e) -> typename std:: auto exceptionStr(const E& e) -> typename std::
......
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