diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-02-07 11:18:35 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-02-07 11:18:35 +0000 |
| commit | d1a1747995d27fcd00026ea20afbbb9a694ac522 (patch) | |
| tree | 17e993ae8e63c49eb793f4fd538cb2d27b1ed77b /storage | |
| parent | 2037c56a04d5edd5d1d3eb197fbdc24d8331e8bf (diff) | |
No need to use c_str.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/src/vespa/storage/visiting/visitor.cpp | 2 | ||||
| -rw-r--r-- | storage/src/vespa/storageframework/generic/clock/time.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/storage/src/vespa/storage/visiting/visitor.cpp b/storage/src/vespa/storage/visiting/visitor.cpp index 03e7a0563b4..73142a624c4 100644 --- a/storage/src/vespa/storage/visiting/visitor.cpp +++ b/storage/src/vespa/storage/visiting/visitor.cpp @@ -213,7 +213,7 @@ Visitor::sendMessage(documentapi::DocumentMessage::UP cmd) cmd->setPriority(_documentPriority); - vespalib::steady_time time =_component.getClock().getMonotonicTime(); + vespalib::steady_time time = _component.getClock().getMonotonicTime(); if ((time + _docBlockTimeout) > _timeToDie) { cmd->setTimeRemaining((_timeToDie > time) ? _timeToDie - time : vespalib::duration::zero()); diff --git a/storage/src/vespa/storageframework/generic/clock/time.cpp b/storage/src/vespa/storageframework/generic/clock/time.cpp index 466b763a3e0..f5426901e4c 100644 --- a/storage/src/vespa/storageframework/generic/clock/time.cpp +++ b/storage/src/vespa/storageframework/generic/clock/time.cpp @@ -40,7 +40,7 @@ getTimeString(uint64_t microSecondTime, TimeFormat format) if (vals.empty()) { ost << "0 seconds"; } } if (vals.empty()) { - return ost.str().c_str(); + return ost.str(); } ost << vals[0].first << " " << vals[0].second; for (uint32_t i=1; i<vals.size(); ++i) { @@ -51,7 +51,7 @@ getTimeString(uint64_t microSecondTime, TimeFormat format) } ost << vals[i].first << " " << vals[i].second; } - return ost.str().c_str(); + return ost.str(); } time_t secondTime = microSecondTime / 1000000; struct tm datestruct; @@ -71,7 +71,7 @@ getTimeString(uint64_t microSecondTime, TimeFormat format) } else if (format == DATETIME_WITH_MICROS) { ost << '.' << std::setw(6) << micros; } - return ost.str().c_str(); + return ost.str(); } uint64_t |