michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(util/script_exception): make sure a script_nested_exception may have a nested script_nested_exception, use LEAN_THREAD_LOCAL macro instead of thread_local

Browse source 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
This commit is contained in:
Leonardo de Moura 2014-01-29 08:07:52 -08:00
parent 24452289dd
commit f101554e93
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/util/script_exception.cpp
View file

@ -7,6 +7,7 @@ Author: Leonardo de Moura
#include <sstream> #include <sstream>
#include <string> #include <string>
#include <cstdlib> #include <cstdlib>
#include "util/thread.h"
#include "util/debug.h" #include "util/debug.h"
#include "util/script_exception.h" #include "util/script_exception.h"
@ -70,7 +71,7 @@ char const * script_exception::get_msg() const noexcept {
} }
char const * script_exception::what() const noexcept { char const * script_exception::what() const noexcept {
static thread_local std::string buffer; static LEAN_THREAD_LOCAL std::string buffer;
std::ostringstream strm; std::ostringstream strm;
char const * msg = get_msg(); char const * msg = get_msg();
char const * space = msg && *msg == ' ' ? "" : " "; char const * space = msg && *msg == ' ' ? "" : " ";
@ -92,10 +93,14 @@ script_nested_exception::script_nested_exception(source s, std::string f, unsign
script_nested_exception::~script_nested_exception() {} script_nested_exception::~script_nested_exception() {}
char const * script_nested_exception::what() const noexcept { char const * script_nested_exception::what() const noexcept {
static thread_local std::string buffer; std::string super_what = script_exception::what();
std::string nested_what = get_exception().what();
{
static LEAN_THREAD_LOCAL std::string buffer;
std::ostringstream strm; std::ostringstream strm;
strm << script_exception::what() << "\n" << get_exception().what(); strm << super_what << "\n" << nested_what;
buffer = strm.str(); buffer = strm.str();
return buffer.c_str(); return buffer.c_str();
} }
} }
}