Get rid of regex_constants::match_partial

[lyx.git] / src / version.h

diff --git a/src/version.h b/src/version.h
index 5eaccc5f4b9287029cc67eaefa9b4a811bcb32f9..ffae5c4f40f7d944179badbb80fa32c4999307be 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -15,18 +15,41 @@
 //namespace lyx {
 
 ///About dialog, inset info, export headers
-extern char const * lyx_version;
+extern char const * const lyx_version;
 //.lyx header. We don't want lyx_version because of VCS conflicts.
 extern const int lyx_version_major;
 extern const int lyx_version_minor;
 ///
-extern char const * lyx_release_date;
+extern char const * const lyx_git_commit_hash;
+///
+extern char const * const lyx_release_date;
+///
+extern char const * const lyx_build_date;
+///
+extern char const * const lyx_build_time;
 
 /// Package identifier (lyx[-<version-suffix>])
-extern char const * lyx_package;
+extern char const * const lyx_package;
 
 /// This is the version information shown by 'lyx -version'
-extern char const * lyx_version_info;
+extern char const * const lyx_version_info;
+
+// Do not remove the comment below, so we get merge conflict in
+// independent branches. Instead add your own.
+#define LYX_FORMAT_LYX 479 // spitz: beamer Lemma layout
+#define LYX_FORMAT_TEX2LYX 479
+
+#if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
+#ifndef _MSC_VER
+#warning "tex2lyx produces an out of date file format."
+#warning "Please update tex2lyx as soon as possible, since it depends implicitly"
+#warning "on the current file format in some places (this causes bugs like #7780)."
+#else
+#pragma message("warning: tex2lyx produces an out of date file format. " \
+       "Please update tex2lyx as soon as possible, since it depends implicitly " \
+       "on the current file format in some places (this causes bugs like #7780).")
+#endif
+#endif
 
 //} // namespace lyx