From e5cc6f6b853c65d48d78d99b039d58750cebfc50 Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Sun, 21 Sep 2008 09:16:50 +0100 Subject: [PATCH 1/1] Switch to developer version numbering Also clean up code while there. Signed-off-by: Marco Costalba --- src/misc.cpp | 35 +++++++++++++++-------------------- src/misc.h | 2 +- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/src/misc.cpp b/src/misc.cpp index cf68055c..6ee65bf6 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -69,26 +69,21 @@ void dbg_print_hit_rate() { /// the constant EngineVersion (defined in misc.h) is empty. const std::string engine_name() { - if(EngineVersion == "") { - static const char monthNames[12][4] = { - "Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec" - }; - const char *dateString = __DATE__; - std::stringstream s; - int month = 0, day = 0; - - for(int i = 0; i < 12; i++) - if(strncmp(dateString, monthNames[i], 3) == 0) - month = i + 1; - day = atoi(dateString+4); - - s << "Glaurung " << (dateString+9) << std::setfill('0') << std::setw(2) - << month << std::setfill('0') << std::setw(2) << day; - - return s.str(); - } - else - return "Glaurung " + EngineVersion; + + if (EngineVersion.empty()) + { + std::string date(__DATE__); // From compiler, format is "Sep 21 2008" + std::string months("Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec"); + + size_t mon = 1 + months.find(date.substr(0, 3)) / 4; + + std::stringstream s; + s << "Glaurung " << date.substr(date.length() - 2) << std::setfill('0') + << std::setw(2) << mon << date.substr(4, 2); + + return s.str(); + } else + return "Glaurung " + EngineVersion; } diff --git a/src/misc.h b/src/misc.h index 8bf09a86..506422b2 100644 --- a/src/misc.h +++ b/src/misc.h @@ -36,7 +36,7 @@ /// Version number. If this is left empty, the current date (in the format /// YYMMDD) is used as a version number. -const std::string EngineVersion = "2.1"; +const std::string EngineVersion = ""; //// -- 2.39.2