Remove unused variable warning and remove preprocessor switch.

This commit is contained in:
Guillaume Munch 2016-08-20 16:05:41 +01:00
parent 6adf079796
commit 193cda6e48

View File

@ -92,24 +92,15 @@ lyx::Converter const * setConverter(string const & from)
return ptr; return ptr;
} }
// Show the error only once // Show the error only once. This is thread-safe.
#ifdef LYX_USE_STD_CALL_ONCE static nullptr_t no_conv = [&]{
// This is thread-safe.
static once_flag flag;
call_once(flag, [&](){
LYXERR0("PreviewLoader::startLoading()\n" LYXERR0("PreviewLoader::startLoading()\n"
<< "No converter from \"" << from << "No converter from \"" << from
<< "\" format has been defined."); << "\" format has been defined.");
}); return nullptr;
#else } ();
// This is also thread-safe according to §6.7.4 of the C++11 standard.
static bool once = ([&]{ return no_conv;
LYXERR0("PreviewLoader::startLoading()\n"
<< "No converter from \"" << from
<< "\" format has been defined.");
} (), true);
#endif
return 0;
} }