Le 21/02/2017 à 07:19, Jean-Marc Lasgouttes a écrit :
Le 21/02/2017 à 00:08, Guillaume Munch a écrit :
Could you do the backport to stable? :)
What about that? Please check especially the code related to
LYX_USE_CXX11 in Cache.h. For the caching, I re-read the code to make
sure that my hand-merging was correct, I hope I did not miss anything.
Thanks for doing this. I thought there was some bigger adaptation to the
code to do but indeed it only looks like a matter of C++98 conversion.
I think it's all good except:
class Cache : private QCache<Key, Val> {
-#if !(defined(__GNUC__) && (__GNUC__ == 4) && (__GNUC_MINOR__ == 6))
+#if defined(LYX_USE_CXX11) && !(defined(__GNUC__) && (__GNUC__ == 4) &&
(__GNUC_MINOR__ == 6))
BTW, why don't you use Cache::contains in getLayout like you do for
other cache uses?
This is explained in the documentation of Cache::object. It is enough to
check for a null pointer in that case.
Guillaume
