summaryrefslogtreecommitdiffstats
path: root/vespalib
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-12-03 21:45:53 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2019-12-04 18:26:06 +0000
commitb8e151a435ccec1ecc03d98bac5b59f4f14514be (patch)
tree140efda301a7e5adc407c44061ba5b0bb41dd212 /vespalib
parent7700f411ea6f4a3e7c0599fae239ec84c18c0038 (diff)
timeout as duration
Conflicts: messagebus/src/vespa/messagebus/testlib/testserver.cpp
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;
}
/**