From e8fb9de7cb4e7d5d4b2fda8b7170b8bf960cbb33 Mon Sep 17 00:00:00 2001
From: Antti Soininen <soininen@ill.fr>
Date: Wed, 25 Oct 2017 12:07:01 +0200
Subject: [PATCH] Code beautification. Re #20969
---
Framework/Types/src/Core/DateAndTime.cpp | 3 ++-
Framework/Types/src/Core/DateAndTimeHelpers.cpp | 6 ++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Framework/Types/src/Core/DateAndTime.cpp b/Framework/Types/src/Core/DateAndTime.cpp
index a7178369f59..c249f820006 100644
--- a/Framework/Types/src/Core/DateAndTime.cpp
+++ b/Framework/Types/src/Core/DateAndTime.cpp
@@ -367,7 +367,8 @@ const DateAndTime &DateAndTime::defaultTime() {
* "yyyy-mm-ddThh:mm:ss[Z+-]tz:tz" or "yyy-MMM-dd hh:mm:ss.ssss"
*/
void DateAndTime::setFromISO8601(const std::string &str) {
- if (!DateAndTimeHelpers::stringIsISO8601(str) && !DateAndTimeHelpers::stringIsPosix(str)) {
+ if (!DateAndTimeHelpers::stringIsISO8601(str) &&
+ !DateAndTimeHelpers::stringIsPosix(str)) {
throw std::invalid_argument("Error interpreting string '" + str +
"' as a date/time.");
}
diff --git a/Framework/Types/src/Core/DateAndTimeHelpers.cpp b/Framework/Types/src/Core/DateAndTimeHelpers.cpp
index 50545bcd945..7d2f4935f30 100644
--- a/Framework/Types/src/Core/DateAndTimeHelpers.cpp
+++ b/Framework/Types/src/Core/DateAndTimeHelpers.cpp
@@ -18,7 +18,8 @@ bool stringIsISO8601(const std::string &date) {
const boost::regex extendedFormat(
R"(^\d{4}-[01]\d-[0-3]\d([T\s][0-2]\d:[0-5]\d(:\d{2})?(.\d+)?(Z|[+-]\d{2}(:?\d{2})?)?)?$)");
if (!boost::regex_match(date, extendedFormat)) {
- const boost::regex basicFormat(R"(^\d{4}[01]\d[0-3]\d([T\s][0-2]\d[0-5]\d(\d{2})?(.\d+)?(Z|[+-]\d{2}(:?\d{2})?)?)?$)");
+ const boost::regex basicFormat(
+ R"(^\d{4}[01]\d[0-3]\d([T\s][0-2]\d[0-5]\d(\d{2})?(.\d+)?(Z|[+-]\d{2}(:?\d{2})?)?)?$)");
return boost::regex_match(date, basicFormat);
}
return true;
@@ -31,7 +32,8 @@ bool stringIsISO8601(const std::string &date) {
*/
bool stringIsPosix(const std::string &date) {
// Formatting taken from boost::to_simple_string.
- const boost::regex format(R"(^\d{4}-[A-Z][a-z]{2}-[0-3]\d\s[0-2]\d:[0-5]\d:\d{2}(.\d+)?$)");
+ const boost::regex format(
+ R"(^\d{4}-[A-Z][a-z]{2}-[0-3]\d\s[0-2]\d:[0-5]\d:\d{2}(.\d+)?$)");
return boost::regex_match(date, format);
}
} // namespace DateAndTimeHelpers
--
GitLab