summaryrefslogtreecommitdiffstats
path: root/vespalib
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-12-05 08:07:39 -0800
committerGitHub <noreply@github.com>2019-12-05 08:07:39 -0800
commita20c602ab5a9ca89c80c0c7da71d623270aef8fc (patch)
treeca44b39db90c505152eaeaa92fc5d911a06bfb1a /vespalib
parent292bcb689af5faa739a5703f6add35cb229dcef6 (diff)
parent8c5597afbaf6cda6d47c49dfd22877dc70456330 (diff)
Merge pull request #11507 from vespa-engine/balder/use-duration-in-messagebus-and-storageapi-rebased-1
timeout as duration
Diffstat (limited to 'vespalib')
-rw-r--r--vespalib/src/vespa/vespalib/util/sync.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/vespalib/src/vespa/vespalib/util/sync.h b/vespalib/src/vespa/vespalib/util/sync.h
index 12961dffef7..8458bc19629 100644
--- a/vespalib/src/vespa/vespalib/util/sync.h
+++ b/vespalib/src/vespa/vespalib/util/sync.h
@@ -378,7 +378,7 @@ public:
bool wait(int msTimeout) {
return wait(std::chrono::milliseconds(msTimeout));
}
- bool wait(std::chrono::milliseconds timeout) {
+ bool wait(std::chrono::nanoseconds timeout) {
return _cond->wait_for(_guard, timeout) == std::cv_status::no_timeout;
}
/**