aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2017-08-29 00:00:39 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2017-08-29 00:00:39 +0300
commit4ba97b671533399e960f9230013f4678cc45b1d2 (patch)
treeaf3c4416157d9fdcb3025d0c10ff56bb4fb129f1
parent63723c0313acf3fb1539fb9a301250bbcc263ecc (diff)
Use system_clock instead of timestamp::clock
-rw-r--r--clean/types-parsers.cxx2
-rw-r--r--libbrep/types.hxx1
-rw-r--r--mod/mod-build-result.cxx2
-rw-r--r--mod/mod-build-task.cxx6
-rw-r--r--mod/mod-builds.cxx2
-rw-r--r--mod/mod-package-version-details.cxx2
-rw-r--r--web/apache/request.cxx4
7 files changed, 10 insertions, 9 deletions
diff --git a/clean/types-parsers.cxx b/clean/types-parsers.cxx
index 26b9a02..8718435 100644
--- a/clean/types-parsers.cxx
+++ b/clean/types-parsers.cxx
@@ -26,7 +26,7 @@ namespace cli
string ov (s.next ());
size_t p (ov.find ('='));
- timestamp now (timestamp::clock::now ());
+ timestamp now (system_clock::now ());
// Convert timeout duration into the time point.
//
diff --git a/libbrep/types.hxx b/libbrep/types.hxx
index 7b74c75..674b888 100644
--- a/libbrep/types.hxx
+++ b/libbrep/types.hxx
@@ -87,6 +87,7 @@ namespace brep
// <libbutl/timestamp.hxx>
//
+ using butl::system_clock;
using butl::timestamp;
using butl::timestamp_nonexistent;
}
diff --git a/mod/mod-build-result.cxx b/mod/mod-build-result.cxx
index 1f5eb69..6cf94b0 100644
--- a/mod/mod-build-result.cxx
+++ b/mod/mod-build-result.cxx
@@ -360,7 +360,7 @@ handle (request& rq, response&)
b->results_section.load ();
b->results = move (rqm.result.results);
- b->timestamp = timestamp::clock::now ();
+ b->timestamp = system_clock::now ();
build_db_->update (b);
}
diff --git a/mod/mod-build-task.cxx b/mod/mod-build-task.cxx
index 771b1ee..55cfd5b 100644
--- a/mod/mod-build-task.cxx
+++ b/mod/mod-build-task.cxx
@@ -213,7 +213,7 @@ handle (request& rq, response& rs)
// Calculate the build (building state) or rebuild (built state) expiration
// time for package configurations
//
- timestamp now (timestamp::clock::now ());
+ timestamp now (system_clock::now ());
auto expiration = [&now] (size_t timeout) -> timestamp
{
@@ -511,7 +511,7 @@ handle (request& rq, response& rs)
b->machine = mh.name;
b->machine_summary = move (mh.summary);
b->target = cm.config->target;
- b->timestamp = timestamp::clock::now ();
+ b->timestamp = system_clock::now ();
build_db_->update (b);
}
@@ -627,7 +627,7 @@ handle (request& rq, response& rs)
b->results_section.load ();
b->results.clear ();
- b->timestamp = timestamp::clock::now ();
+ b->timestamp = system_clock::now ();
build_db_->update (b);
diff --git a/mod/mod-builds.cxx b/mod/mod-builds.cxx
index 7b806bf..04094e5 100644
--- a/mod/mod-builds.cxx
+++ b/mod/mod-builds.cxx
@@ -421,7 +421,7 @@ handle (request& rq, response& rs)
// Print package build configurations ordered by the timestamp (later goes
// first).
//
- timestamp now (timestamp::clock::now ());
+ timestamp now (system_clock::now ());
// Enclose the subsequent tables to be able to use nth-child CSS selector.
//
diff --git a/mod/mod-package-version-details.cxx b/mod/mod-package-version-details.cxx
index 6007a80..d0d5978 100644
--- a/mod/mod-package-version-details.cxx
+++ b/mod/mod-package-version-details.cxx
@@ -348,7 +348,7 @@ handle (request& rq, response& rs)
s << H3 << "Builds" << ~H3
<< DIV(ID="builds");
- timestamp now (timestamp::clock::now ());
+ timestamp now (system_clock::now ());
transaction t (build_db_->begin ());
// Print built package configurations.
diff --git a/web/apache/request.cxx b/web/apache/request.cxx
index da016b5..78e0fc0 100644
--- a/web/apache/request.cxx
+++ b/web/apache/request.cxx
@@ -521,8 +521,8 @@ namespace web
if (max_age)
{
- timestamp tp (timestamp::clock::now () + *max_age);
- time_t t (timestamp::clock::to_time_t (tp));
+ timestamp tp (system_clock::now () + *max_age);
+ time_t t (system_clock::to_time_t (tp));
// Assume global locale is not changed and still "C".
//