diff --git a/src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri b/src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri index f79c1dcab89..5fbe996d06b 100644 --- a/src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri +++ b/src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri @@ -45,7 +45,8 @@ HEADERS += $$PWD/clangcodemodelserver.h \ $$PWD/clangexceptions.h \ $$PWD/clangdocumentprocessor.h \ $$PWD/clangdocumentprocessors.h \ - $$PWD/clangtranslationunits.h + $$PWD/clangtranslationunits.h \ + $$PWD/clangclock.h \ SOURCES += $$PWD/clangcodemodelserver.cpp \ $$PWD/codecompleter.cpp \ diff --git a/src/tools/clangbackend/ipcsource/clangclock.h b/src/tools/clangbackend/ipcsource/clangclock.h new file mode 100644 index 00000000000..68d91478f74 --- /dev/null +++ b/src/tools/clangbackend/ipcsource/clangclock.h @@ -0,0 +1,36 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Creator. +** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +****************************************************************************/ + +#pragma once + +#include + +namespace ClangBackEnd { + +using Clock = std::chrono::steady_clock; +using Duration = std::chrono::steady_clock::duration; +using TimePoint = std::chrono::steady_clock::time_point; + +} // namespace ClangBackEnd diff --git a/src/tools/clangbackend/ipcsource/clangdocument.cpp b/src/tools/clangbackend/ipcsource/clangdocument.cpp index af45cc43f5b..49c1a3cef0a 100644 --- a/src/tools/clangbackend/ipcsource/clangdocument.cpp +++ b/src/tools/clangbackend/ipcsource/clangdocument.cpp @@ -63,14 +63,14 @@ public: const Utf8StringVector fileArguments; ProjectPart projectPart; - time_point lastProjectPartChangeTimePoint; + TimePoint lastProjectPartChangeTimePoint; TranslationUnits translationUnits; QSet dependedFilePaths; uint documentRevision = 0; - time_point needsToBeReparsedChangeTimePoint; + TimePoint needsToBeReparsedChangeTimePoint; bool hasParseOrReparseFailed = false; bool needsToBeReparsed = false; bool isUsedByCurrentEditor = false; @@ -85,7 +85,7 @@ DocumentData::DocumentData(const Utf8String &filePath, filePath(filePath), fileArguments(fileArguments), projectPart(projectPart), - lastProjectPartChangeTimePoint(std::chrono::steady_clock::now()), + lastProjectPartChangeTimePoint(Clock::now()), translationUnits(filePath), needsToBeReparsedChangeTimePoint(lastProjectPartChangeTimePoint) { @@ -183,7 +183,7 @@ const ProjectPart &Document::projectPart() const return d->projectPart; } -const time_point Document::lastProjectPartChangeTimePoint() const +const TimePoint Document::lastProjectPartChangeTimePoint() const { checkIfNull(); @@ -239,7 +239,7 @@ void Document::setIsVisibleInEditor(bool isVisibleInEditor) d->isVisibleInEditor = isVisibleInEditor; } -time_point Document::isNeededReparseChangeTimePoint() const +TimePoint Document::isNeededReparseChangeTimePoint() const { checkIfNull(); @@ -312,7 +312,7 @@ void Document::incorporateUpdaterResult(const TranslationUnitUpdateResult &resul if (result.hasParsed() || result.hasReparsed()) { d->dependedFilePaths = result.dependedOnFilePaths; - const time_point timePoint = qMax(result.parseTimePoint, result.reparseTimePoint); + const TimePoint timePoint = qMax(result.parseTimePoint, result.reparseTimePoint); d->translationUnits.updateParseTimePoint(result.translationUnitId, timePoint); } @@ -366,7 +366,7 @@ const QSet Document::dependedFilePaths() const void Document::setDirty() { - d->needsToBeReparsedChangeTimePoint = std::chrono::steady_clock::now(); + d->needsToBeReparsedChangeTimePoint = Clock::now(); d->needsToBeReparsed = true; } diff --git a/src/tools/clangbackend/ipcsource/clangdocument.h b/src/tools/clangbackend/ipcsource/clangdocument.h index 712b10d6dea..91112e9cddc 100644 --- a/src/tools/clangbackend/ipcsource/clangdocument.h +++ b/src/tools/clangbackend/ipcsource/clangdocument.h @@ -37,7 +37,6 @@ #include #include -#include #include class Utf8String; @@ -52,8 +51,6 @@ class ProjectPart; class FileContainer; class Documents; -using time_point = std::chrono::steady_clock::time_point; - class Document { public: @@ -87,7 +84,7 @@ public: Utf8String projectPartId() const; const ProjectPart &projectPart() const; - const time_point lastProjectPartChangeTimePoint() const; + const TimePoint lastProjectPartChangeTimePoint() const; bool isProjectPartOutdated() const; uint documentRevision() const; @@ -116,7 +113,7 @@ public: // for tests const QSet dependedFilePaths() const; TranslationUnitUpdater createUpdater() const; void setHasParseOrReparseFailed(bool hasFailed); - time_point isNeededReparseChangeTimePoint() const; + TimePoint isNeededReparseChangeTimePoint() const; private: void setDirty(); diff --git a/src/tools/clangbackend/ipcsource/clangjobrequest.h b/src/tools/clangbackend/ipcsource/clangjobrequest.h index ca75e4ec675..1979c51874e 100644 --- a/src/tools/clangbackend/ipcsource/clangjobrequest.h +++ b/src/tools/clangbackend/ipcsource/clangjobrequest.h @@ -25,18 +25,16 @@ #pragma once +#include "clangclock.h" + #include #include #include #include -#include - namespace ClangBackEnd { -using time_point = std::chrono::steady_clock::time_point; - class JobRequest { public: @@ -72,8 +70,8 @@ public: // General Utf8String filePath; Utf8String projectPartId; - time_point unsavedFilesChangeTimePoint; - time_point projectChangeTimePoint; + TimePoint unsavedFilesChangeTimePoint; + TimePoint projectChangeTimePoint; uint documentRevision = 0; // For code completion diff --git a/src/tools/clangbackend/ipcsource/clangtranslationunits.cpp b/src/tools/clangbackend/ipcsource/clangtranslationunits.cpp index 6992dbd1a67..394d653e483 100644 --- a/src/tools/clangbackend/ipcsource/clangtranslationunits.cpp +++ b/src/tools/clangbackend/ipcsource/clangtranslationunits.cpp @@ -77,11 +77,11 @@ TranslationUnit TranslationUnits::get(PreferredTranslationUnit type) } void TranslationUnits::updateParseTimePoint(const Utf8String &translationUnitId, - time_point timePoint) + TimePoint timePoint) { TranslationUnitData &unit = findUnit(translationUnitId); - QTC_CHECK(timePoint != time_point()); + QTC_CHECK(timePoint != TimePoint()); unit.parseTimePoint = timePoint; qCDebug(tuLog) << "Updated" << translationUnitId << "for" << QFileInfo(m_filePath).fileName() @@ -92,7 +92,7 @@ void TranslationUnits::updateParseTimePoint(const Utf8String &translationUnitId, bool TranslationUnits::areAllTranslationUnitsParsed() const { return Utils::allOf(m_tuDatas, [](const TranslationUnitData &unit) { - return unit.parseTimePoint != time_point(); + return unit.parseTimePoint != TimePoint(); }); } diff --git a/src/tools/clangbackend/ipcsource/clangtranslationunits.h b/src/tools/clangbackend/ipcsource/clangtranslationunits.h index b5bd1dc3d10..77f771cd98a 100644 --- a/src/tools/clangbackend/ipcsource/clangtranslationunits.h +++ b/src/tools/clangbackend/ipcsource/clangtranslationunits.h @@ -26,6 +26,7 @@ #pragma once #include "clangbackend_global.h" +#include "clangclock.h" #include @@ -33,12 +34,8 @@ #include -#include - namespace ClangBackEnd { -using time_point = std::chrono::steady_clock::time_point; - class TranslationUnit; class TranslationUnits @@ -55,7 +52,7 @@ public: CXTranslationUnit cxTranslationUnit = nullptr; CXIndex cxIndex = nullptr; - time_point parseTimePoint; + TimePoint parseTimePoint; }; public: @@ -64,7 +61,7 @@ public: TranslationUnit createAndAppend(); TranslationUnit get(PreferredTranslationUnit type = PreferredTranslationUnit::RecentlyParsed); - void updateParseTimePoint(const Utf8String &translationUnitId, time_point timePoint); + void updateParseTimePoint(const Utf8String &translationUnitId, TimePoint timePoint); private: bool areAllTranslationUnitsParsed() const; diff --git a/src/tools/clangbackend/ipcsource/clangtranslationunitupdater.cpp b/src/tools/clangbackend/ipcsource/clangtranslationunitupdater.cpp index dec3334be47..e65ce61fa1d 100644 --- a/src/tools/clangbackend/ipcsource/clangtranslationunitupdater.cpp +++ b/src/tools/clangbackend/ipcsource/clangtranslationunitupdater.cpp @@ -124,7 +124,7 @@ void TranslationUnitUpdater::createTranslationUnitIfNeeded() if (parseWasSuccessful()) { updateIncludeFilePaths(); - m_out.parseTimePoint = std::chrono::steady_clock::now(); + m_out.parseTimePoint = Clock::now(); } else { qWarning() << "Parsing" << m_in.filePath << "failed:" << errorCodeToText(m_parseErrorCode); @@ -153,7 +153,7 @@ void TranslationUnitUpdater::reparse() if (reparseWasSuccessful()) { updateIncludeFilePaths(); - m_out.reparseTimePoint = std::chrono::steady_clock::now(); + m_out.reparseTimePoint = Clock::now(); m_out.needsToBeReparsedChangeTimePoint = m_in.needsToBeReparsedChangeTimePoint; } else { qWarning() << "Reparsing" << m_in.filePath << "failed:" << m_reparseErrorCode; diff --git a/src/tools/clangbackend/ipcsource/clangtranslationunitupdater.h b/src/tools/clangbackend/ipcsource/clangtranslationunitupdater.h index 8f34339111b..547c6838bc3 100644 --- a/src/tools/clangbackend/ipcsource/clangtranslationunitupdater.h +++ b/src/tools/clangbackend/ipcsource/clangtranslationunitupdater.h @@ -25,6 +25,8 @@ #pragma once +#include "clangclock.h" + #include "commandlinearguments.h" #include "unsavedfiles.h" #include "utf8stringvector.h" @@ -33,18 +35,14 @@ #include -#include - namespace ClangBackEnd { -using time_point = std::chrono::steady_clock::time_point; - class TranslationUnitUpdateInput { public: bool parseNeeded = false; bool reparseNeeded = false; - time_point needsToBeReparsedChangeTimePoint; + TimePoint needsToBeReparsedChangeTimePoint; Utf8String filePath; Utf8StringVector fileArguments; @@ -57,18 +55,18 @@ public: class TranslationUnitUpdateResult { public: bool hasParsed() const - { return parseTimePoint != time_point(); } + { return parseTimePoint != TimePoint(); } bool hasReparsed() const - { return reparseTimePoint != time_point(); } + { return reparseTimePoint != TimePoint(); } public: Utf8String translationUnitId; bool hasParseOrReparseFailed = false; - time_point parseTimePoint; - time_point reparseTimePoint; - time_point needsToBeReparsedChangeTimePoint; + TimePoint parseTimePoint; + TimePoint reparseTimePoint; + TimePoint needsToBeReparsedChangeTimePoint; QSet dependedOnFilePaths; }; diff --git a/src/tools/clangbackend/ipcsource/projectpart.cpp b/src/tools/clangbackend/ipcsource/projectpart.cpp index b9060df2975..556aa4847c9 100644 --- a/src/tools/clangbackend/ipcsource/projectpart.cpp +++ b/src/tools/clangbackend/ipcsource/projectpart.cpp @@ -39,13 +39,13 @@ public: ~ProjectPartData(); public: - time_point lastChangeTimePoint; + TimePoint lastChangeTimePoint; Utf8StringVector arguments; Utf8String projectPartId; }; ProjectPartData::ProjectPartData(const Utf8String &projectPartId) - : lastChangeTimePoint(std::chrono::steady_clock::now()), + : lastChangeTimePoint(Clock::now()), projectPartId(projectPartId) { } @@ -111,14 +111,14 @@ const Utf8StringVector ProjectPart::arguments() const return d->arguments; } -const time_point &ProjectPart::lastChangeTimePoint() const +const TimePoint &ProjectPart::lastChangeTimePoint() const { return d->lastChangeTimePoint; } void ProjectPart::updateLastChangeTimePoint() { - d->lastChangeTimePoint = std::chrono::steady_clock::now(); + d->lastChangeTimePoint = Clock::now(); } bool operator==(const ProjectPart &first, const ProjectPart &second) diff --git a/src/tools/clangbackend/ipcsource/projectpart.h b/src/tools/clangbackend/ipcsource/projectpart.h index d359751c4cc..9cbea8e563a 100644 --- a/src/tools/clangbackend/ipcsource/projectpart.h +++ b/src/tools/clangbackend/ipcsource/projectpart.h @@ -25,9 +25,10 @@ #pragma once +#include "clangclock.h" + #include -#include #include class Utf8StringVector; @@ -37,8 +38,6 @@ namespace ClangBackEnd { class ProjectPartContainer; class ProjectPartData; -using time_point = std::chrono::steady_clock::time_point; - class ProjectPart { public: @@ -61,7 +60,7 @@ public: void setArguments(const Utf8StringVector &arguments_); const Utf8StringVector arguments() const; - const time_point &lastChangeTimePoint() const; + const TimePoint &lastChangeTimePoint() const; private: void updateLastChangeTimePoint(); diff --git a/src/tools/clangbackend/ipcsource/unsavedfiles.cpp b/src/tools/clangbackend/ipcsource/unsavedfiles.cpp index 5224e14e9a1..64f2afe3ff0 100644 --- a/src/tools/clangbackend/ipcsource/unsavedfiles.cpp +++ b/src/tools/clangbackend/ipcsource/unsavedfiles.cpp @@ -40,12 +40,12 @@ public: UnsavedFilesData(); public: - time_point lastChangeTimePoint; + TimePoint lastChangeTimePoint; QVector unsavedFiles; }; UnsavedFilesData::UnsavedFilesData() - : lastChangeTimePoint(std::chrono::steady_clock::now()) + : lastChangeTimePoint(Clock::now()) { } @@ -116,7 +116,7 @@ UnsavedFilesShallowArguments UnsavedFiles::shallowArguments() const return UnsavedFilesShallowArguments(*this); } -const time_point UnsavedFiles::lastChangeTimePoint() const +const TimePoint UnsavedFiles::lastChangeTimePoint() const { return d->lastChangeTimePoint; } @@ -154,7 +154,7 @@ void UnsavedFiles::addOrUpdateUnsavedFile(const FileContainer &fileContainer) void UnsavedFiles::updateLastChangeTimePoint() { - d->lastChangeTimePoint = std::chrono::steady_clock::now(); + d->lastChangeTimePoint = Clock::now(); } } // namespace ClangBackEnd diff --git a/src/tools/clangbackend/ipcsource/unsavedfiles.h b/src/tools/clangbackend/ipcsource/unsavedfiles.h index 541d6c3a6a9..eacab0bc342 100644 --- a/src/tools/clangbackend/ipcsource/unsavedfiles.h +++ b/src/tools/clangbackend/ipcsource/unsavedfiles.h @@ -25,6 +25,8 @@ #pragma once +#include "clangclock.h" + #include #include @@ -32,12 +34,8 @@ #include -#include - namespace ClangBackEnd { -using time_point = std::chrono::steady_clock::time_point; - class UnsavedFile; class UnsavedFilesData; class UnsavedFilesShallowArguments; @@ -61,7 +59,7 @@ public: UnsavedFilesShallowArguments shallowArguments() const; - const time_point lastChangeTimePoint() const; + const TimePoint lastChangeTimePoint() const; private: void updateUnsavedFileWithFileContainer(const FileContainer &fileContainer); diff --git a/tests/unit/unittest/clangdocument-test.cpp b/tests/unit/unittest/clangdocument-test.cpp index 8ec6a608cc8..a6a32dcf939 100644 --- a/tests/unit/unittest/clangdocument-test.cpp +++ b/tests/unit/unittest/clangdocument-test.cpp @@ -25,6 +25,7 @@ #include "googletest.h" +#include #include #include #include @@ -47,9 +48,10 @@ #include -#include #include +using ClangBackEnd::Clock; +using ClangBackEnd::Duration; using ClangBackEnd::FileContainer; using ClangBackEnd::FilePath; using ClangBackEnd::Document; @@ -165,7 +167,7 @@ TEST_F(Document, LastCommandLineArgumentIsFilePath) TEST_F(Document, TimeStampForProjectPartChangeIsUpdatedAsNewCxTranslationUnitIsGenerated) { auto lastChangeTimePoint = document.lastProjectPartChangeTimePoint(); - std::this_thread::sleep_for(std::chrono::steady_clock::duration(1)); + std::this_thread::sleep_for(Duration(1)); document.parse(); @@ -177,7 +179,7 @@ TEST_F(Document, TimeStampForProjectPartChangeIsUpdatedAsProjectPartIsCleared) ProjectPart projectPart = document.projectPart(); document.parse(); auto lastChangeTimePoint = document.lastProjectPartChangeTimePoint(); - std::this_thread::sleep_for(std::chrono::steady_clock::duration(1)); + std::this_thread::sleep_for(Duration(1)); projectPart.clear(); document.parse(); @@ -334,7 +336,7 @@ TEST_F(Document, IncorporateUpdaterResultResetsDirtyness) { document.setDirtyIfDependencyIsMet(document.filePath()); TranslationUnitUpdateResult result; - result.reparseTimePoint = std::chrono::steady_clock::now(); + result.reparseTimePoint = Clock::now(); result.needsToBeReparsedChangeTimePoint = document.isNeededReparseChangeTimePoint(); result.translationUnitId = document.translationUnit().id(); @@ -346,8 +348,8 @@ TEST_F(Document, IncorporateUpdaterResultResetsDirtyness) TEST_F(Document, IncorporateUpdaterResultDoesNotResetDirtynessIfItWasChanged) { TranslationUnitUpdateResult result; - result.reparseTimePoint = std::chrono::steady_clock::now(); - result.needsToBeReparsedChangeTimePoint = std::chrono::steady_clock::now(); + result.reparseTimePoint = Clock::now(); + result.needsToBeReparsedChangeTimePoint = Clock::now(); result.translationUnitId = document.translationUnit().id(); document.setDirtyIfDependencyIsMet(document.filePath()); @@ -360,12 +362,12 @@ TEST_F(Document, IncorporateUpdaterResultUpdatesTranslationUnitsReparseTimePoint { TranslationUnits &translationUnits = document.translationUnits(); const TranslationUnit initialTranslationUnit = translationUnits.get(); - translationUnits.updateParseTimePoint(initialTranslationUnit.id(), std::chrono::steady_clock::now()); + translationUnits.updateParseTimePoint(initialTranslationUnit.id(), Clock::now()); const TranslationUnit alternativeTranslationUnit = translationUnits.createAndAppend(); - translationUnits.updateParseTimePoint(alternativeTranslationUnit.id(), std::chrono::steady_clock::now()); + translationUnits.updateParseTimePoint(alternativeTranslationUnit.id(), Clock::now()); TranslationUnitUpdateResult result; - result.reparseTimePoint = std::chrono::steady_clock::now(); - result.needsToBeReparsedChangeTimePoint = std::chrono::steady_clock::now(); + result.reparseTimePoint = Clock::now(); + result.needsToBeReparsedChangeTimePoint = Clock::now(); result.translationUnitId = initialTranslationUnit.id(); document.setDirtyIfDependencyIsMet(document.filePath()); ASSERT_THAT(translationUnits.get().id(), Eq(alternativeTranslationUnit.id())); diff --git a/tests/unit/unittest/clangtranslationunits-test.cpp b/tests/unit/unittest/clangtranslationunits-test.cpp index bf039338aa1..ddd386b6bf0 100644 --- a/tests/unit/unittest/clangtranslationunits-test.cpp +++ b/tests/unit/unittest/clangtranslationunits-test.cpp @@ -31,13 +31,12 @@ #include -#include - #include #include #include #include "gtest-qt-printing.h" +using ClangBackEnd::Clock; using ClangBackEnd::TranslationUnit; using ClangBackEnd::TranslationUnits; using ClangBackEnd::TranslationUnitDoesNotExist; @@ -88,7 +87,7 @@ TEST_F(TranslationUnits, GetFirstForMultipleTranslationUnits) TEST_F(TranslationUnits, GetFirstForMultipleTranslationUnitsAndOnlyFirstParsed) { const TranslationUnit created1 = translationUnits.createAndAppend(); - translationUnits.updateParseTimePoint(created1.id(), std::chrono::steady_clock::now()); + translationUnits.updateParseTimePoint(created1.id(), Clock::now()); translationUnits.createAndAppend(); const TranslationUnit queried = translationUnits.get(); @@ -100,7 +99,7 @@ TEST_F(TranslationUnits, GetFirstForMultipleTranslationUnitsAndOnlySecondParsed) { const TranslationUnit created1 = translationUnits.createAndAppend(); const TranslationUnit created2 = translationUnits.createAndAppend(); - translationUnits.updateParseTimePoint(created2.id(), std::chrono::steady_clock::now()); + translationUnits.updateParseTimePoint(created2.id(), Clock::now()); const TranslationUnit queried = translationUnits.get(); @@ -110,9 +109,9 @@ TEST_F(TranslationUnits, GetFirstForMultipleTranslationUnitsAndOnlySecondParsed) TEST_F(TranslationUnits, GetRecentForMultipleTranslationUnits) { const TranslationUnit created1 = translationUnits.createAndAppend(); - translationUnits.updateParseTimePoint(created1.id(), std::chrono::steady_clock::now()); + translationUnits.updateParseTimePoint(created1.id(), Clock::now()); const TranslationUnit created2 = translationUnits.createAndAppend(); - translationUnits.updateParseTimePoint(created2.id(), std::chrono::steady_clock::now()); + translationUnits.updateParseTimePoint(created2.id(), Clock::now()); const TranslationUnit queried = translationUnits.get(PreferredTranslationUnit::RecentlyParsed); @@ -122,9 +121,9 @@ TEST_F(TranslationUnits, GetRecentForMultipleTranslationUnits) TEST_F(TranslationUnits, GetPreviousForMultipleTranslationUnits) { const TranslationUnit created1 = translationUnits.createAndAppend(); - translationUnits.updateParseTimePoint(created1.id(), std::chrono::steady_clock::now()); + translationUnits.updateParseTimePoint(created1.id(), Clock::now()); const TranslationUnit created2 = translationUnits.createAndAppend(); - translationUnits.updateParseTimePoint(created2.id(), std::chrono::steady_clock::now()); + translationUnits.updateParseTimePoint(created2.id(), Clock::now()); const TranslationUnit queried = translationUnits.get(PreferredTranslationUnit::PreviouslyParsed); @@ -136,7 +135,7 @@ TEST_F(TranslationUnits, UpdateThrowsForNotExisting) ClangBackEnd::TranslationUnits otherTranslationUnits{someFilePath}; const TranslationUnit translationUnit = otherTranslationUnits.createAndAppend(); - ASSERT_THROW(translationUnits.updateParseTimePoint(translationUnit.id(), std::chrono::steady_clock::now()), + ASSERT_THROW(translationUnits.updateParseTimePoint(translationUnit.id(), Clock::now()), TranslationUnitDoesNotExist); } diff --git a/tests/unit/unittest/clangupdatedocumentannotationsjob-test.cpp b/tests/unit/unittest/clangupdatedocumentannotationsjob-test.cpp index a76e0f8703c..291f2e298c3 100644 --- a/tests/unit/unittest/clangupdatedocumentannotationsjob-test.cpp +++ b/tests/unit/unittest/clangupdatedocumentannotationsjob-test.cpp @@ -97,7 +97,7 @@ TEST_F(UpdateDocumentAnnotationsJob, DontSendAnnotationsIfDocumentRevisionChange TEST_F(UpdateDocumentAnnotationsJob, UpdatesTranslationUnit) { - const time_point timePointBefore = document.lastProjectPartChangeTimePoint(); + const TimePoint timePointBefore = document.lastProjectPartChangeTimePoint(); const QSet dependendOnFilesBefore = document.dependedFilePaths(); job.setContext(jobContext); job.prepareAsyncRun(); diff --git a/tests/unit/unittest/projectpart-test.cpp b/tests/unit/unittest/projectpart-test.cpp index 7595cedbfc2..ec5d99f9b43 100644 --- a/tests/unit/unittest/projectpart-test.cpp +++ b/tests/unit/unittest/projectpart-test.cpp @@ -25,12 +25,12 @@ #include "googletest.h" +#include #include #include #include #include -#include #include using testing::ElementsAre; @@ -82,7 +82,7 @@ TEST(ProjectPart, TimeStampIsUpdatedAsArgumentChanged) { ClangBackEnd::ProjectPart project(Utf8StringLiteral("/tmp/blah.pro")); auto lastChangeTimePoint = project.lastChangeTimePoint(); - std::this_thread::sleep_for(std::chrono::steady_clock::duration(1)); + std::this_thread::sleep_for(ClangBackEnd::Duration(1)); project.setArguments(Utf8StringVector({Utf8StringLiteral("-O"), Utf8StringLiteral("-fast")})); @@ -163,7 +163,7 @@ TEST(ProjectPart, ProjectPartIsClearedAfterRemove) projects.createOrUpdate({projectContainer}); ClangBackEnd::ProjectPart project = *projects.findProjectPart(projectContainer.projectPartId()); const auto lastChangeTimePoint = project.lastChangeTimePoint(); - std::this_thread::sleep_for(std::chrono::steady_clock::duration(1)); + std::this_thread::sleep_for(ClangBackEnd::Duration(1)); projects.remove({projectContainer.projectPartId()}); diff --git a/tests/unit/unittest/translationunitupdater-test.cpp b/tests/unit/unittest/translationunitupdater-test.cpp index 8a4e8ad0f60..dd490cda98c 100644 --- a/tests/unit/unittest/translationunitupdater-test.cpp +++ b/tests/unit/unittest/translationunitupdater-test.cpp @@ -25,10 +25,13 @@ #include "googletest.h" +#include #include #include +using ClangBackEnd::Clock; +using ClangBackEnd::TimePoint; using ClangBackEnd::TranslationUnitUpdater; using ClangBackEnd::TranslationUnitUpdateInput; using ClangBackEnd::TranslationUnitUpdateResult; @@ -88,7 +91,7 @@ TEST_F(TranslationUnitUpdater, PropagatesTranslationUnitId) TEST_F(TranslationUnitUpdater, UpdatesParseTimePoint) { ::TranslationUnitUpdater updater = createUpdater(createInput()); - const std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now(); + const TimePoint now = Clock::now(); TranslationUnitUpdateResult result = updater.update(::TranslationUnitUpdater::UpdateMode::AsNeeded);