anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-28 04:17:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove unused variable warning and remove preprocessor switch.

Browse Source
This commit is contained in:
Guillaume Munch 2016-08-20 16:05:41 +01:00
parent 6adf079796
commit 193cda6e48
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/graphics/PreviewLoader.cpp
View File

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