#ifndef LYX_REGEXP_H
#define LYX_REGEXP_H
-#if __cplusplus >= 201103L && defined(LYX_USE_STD_REGEX)
+#if defined(LYX_USE_CXX11) && defined(LYX_USE_STD_REGEX)
# include <regex>
# ifdef _MSC_VER
namespace lyx {
// inheriting 'private' to see which functions are used and if there are
// other ECMAScrip defaults
+ // FIXME: Is this really needed?
+ // If yes, then the MSVC regex implementation is not standard-conforming.
class regex : private std::regex
{
public: