From 85919e894b8880bee5274a6c9f5c895218351d52 Mon Sep 17 00:00:00 2001 From: lloyd Date: Fri, 14 Sep 2012 17:22:16 +0000 Subject: Build the return value of version_string at compile time instead of at runtime so it's easy to find in a binary with strings. --- src/utils/version.cpp | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'src/utils') diff --git a/src/utils/version.cpp b/src/utils/version.cpp index acc8bee61..49fec4392 100644 --- a/src/utils/version.cpp +++ b/src/utils/version.cpp @@ -7,7 +7,6 @@ #include #include -#include namespace Botan { @@ -22,21 +21,23 @@ namespace Botan { */ std::string version_string() { - std::ostringstream out; - - out << "Botan " << version_major() << "." - << version_minor() << "." - << version_patch() << " ("; - - if(BOTAN_VERSION_DATESTAMP == 0) - out << "unreleased version"; - else - out << "released " << version_datestamp(); - - out << ", revision " << BOTAN_VERSION_VC_REVISION; - out << ", distribution " << BOTAN_DISTRIBUTION_INFO << ")"; - - return out.str(); +#define QUOTE(name) #name +#define STR(macro) QUOTE(macro) + + return "Botan " STR(BOTAN_VERSION_MAJOR) "." + STR(BOTAN_VERSION_MINOR) "." + STR(BOTAN_VERSION_PATCH) " (" + +#if (BOTAN_VERSION_DATESTAMP == 0) + "unreleased version built " __DATE__ +#else + "released " STR(BOTAN_VERSION_DATESTAMP) +#endif + ", revision " BOTAN_VERSION_VC_REVISION + ", distribution " BOTAN_DISTRIBUTION_INFO ")"; + +#undef STR +#undef QUOTE } u32bit version_datestamp() { return BOTAN_VERSION_DATESTAMP; } -- cgit v1.2.3