feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ClangPchManager: Use TimeStamp instead of long long

Browse Source 
Change-Id: If8a429238d31492506c68bb523ceeb4bacad157e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2019-07-25 13:34:07 +02:00
parent 1e703a6901
commit 0fe6811acd
5 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/tools/clangpchmanagerbackend/source/precompiledheaderstorage.h
View File

@@ -50,14 +50,14 @@ public:
void insertProjectPrecompiledHeader(ProjectPartId projectPartId,
Utils::SmallStringView pchPath,
long long pchBuildTime) override
TimeStamp pchBuildTime) override
{
try {
Sqlite::ImmediateTransaction transaction{database};
insertProjectPrecompiledHeaderStatement.write(projectPartId.projectPathId,
pchPath,
pchBuildTime);
pchBuildTime.value);
transaction.commit();
} catch (const Sqlite::StatementIsBusy &) {
@@ -65,13 +65,13 @@ public:
}
}
void deleteProjectPrecompiledHeader(ProjectPartId projectPartId, long long pchBuildTime) override
void deleteProjectPrecompiledHeader(ProjectPartId projectPartId, TimeStamp pchBuildTime) override
{
try {
Sqlite::ImmediateTransaction transaction{database};
deleteProjectPrecompiledHeaderPathAndSetBuildTimeStatement.write(projectPartId.projectPathId,
pchBuildTime);
pchBuildTime.value);
transaction.commit();
} catch (const Sqlite::StatementIsBusy) {
@@ -95,7 +95,7 @@ public:
void insertSystemPrecompiledHeaders(const ProjectPartIds &projectPartIds,
Utils::SmallStringView pchPath,
long long pchBuildTime) override
TimeStamp pchBuildTime) override
{
try {
Sqlite::ImmediateTransaction transaction{database};
@@ -103,7 +103,7 @@ public:
for (ProjectPartId projectPartId : projectPartIds) {
insertSystemPrecompiledHeaderStatement.write(projectPartId.projectPathId,
pchPath,
pchBuildTime);
pchBuildTime.value);
}
transaction.commit();
} catch (const Sqlite::StatementIsBusy) {

7
src/tools/clangpchmanagerbackend/source/precompiledheaderstorageinterface.h
View File

@@ -29,6 +29,7 @@
#include <pchpaths.h>
#include <projectpartid.h>
#include <sourceentry.h>
#include <utils/smallstringvector.h>
#include <utils/optional.h>
@@ -45,13 +46,13 @@ public:
virtual void insertProjectPrecompiledHeader(ProjectPartId projectPartId,
Utils::SmallStringView pchPath,
long long pchBuildTime)
TimeStamp pchBuildTime)
= 0;
virtual void deleteProjectPrecompiledHeader(ProjectPartId projectPartId, long long pchBuildTime) = 0;
virtual void deleteProjectPrecompiledHeader(ProjectPartId projectPartId, TimeStamp pchBuildTime) = 0;
virtual void deleteProjectPrecompiledHeaders(const ProjectPartIds &projectPartIds) = 0;
virtual void insertSystemPrecompiledHeaders(const ProjectPartIds &projectPartIds,
Utils::SmallStringView pchPath,
long long pchBuildTime)
TimeStamp pchBuildTime)
= 0;
virtual void deleteSystemPrecompiledHeaders(const ProjectPartIds &projectPartIds) = 0;
virtual FilePath fetchSystemPrecompiledHeaderPath(ProjectPartId projectPartId) = 0;

2
src/tools/clangrefactoringbackend/source/indexdataconsumer.cpp
View File

@@ -69,7 +69,7 @@ class IndexingDeclVisitor : public clang::ConstDeclVisitor<IndexingDeclVisitor,
public:
SymbolKindAndTags VisitEnumDecl(const clang::EnumDecl */*declaration*/)
{
return {SymbolKind::Enumeration, {}};;
return {SymbolKind::Enumeration, {}};
}
SymbolKindAndTags VisitRecordDecl(const clang::RecordDecl *declaration)
{

6
tests/unit/unittest/mockprecompiledheaderstorage.h
View File

@@ -35,15 +35,15 @@ public:
MOCK_METHOD3(insertProjectPrecompiledHeader,
void(ClangBackEnd::ProjectPartId projectPartId,
Utils::SmallStringView pchPath,
long long pchBuildTime));
ClangBackEnd::TimeStamp pchBuildTime));
MOCK_METHOD2(deleteProjectPrecompiledHeader,
void(ClangBackEnd::ProjectPartId projectPartId, long long buildTime));
void(ClangBackEnd::ProjectPartId projectPartId, ClangBackEnd::TimeStamp buildTime));
MOCK_METHOD1(deleteProjectPrecompiledHeaders,
void(const ClangBackEnd::ProjectPartIds &projectPartIds));
MOCK_METHOD3(insertSystemPrecompiledHeaders,
void(const ClangBackEnd::ProjectPartIds &projectPartIds,
Utils::SmallStringView pchPath,
long long pchBuildTime));
ClangBackEnd::TimeStamp pchBuildTime));
MOCK_METHOD1(deleteSystemPrecompiledHeaders,
void(const ClangBackEnd::ProjectPartIds &projectPartIds));
MOCK_METHOD1(fetchSystemPrecompiledHeaderPath,

4
tests/unit/unittest/pchtaskqueue-test.cpp
View File

@@ -334,7 +334,7 @@ TEST_F(PchTaskQueue, CreateProjectTaskFromPchTask)
EXPECT_CALL(mockPchCreator, generatePch(Eq(projectTask)));
EXPECT_CALL(mockPchCreator, projectPartPch()).WillOnce(ReturnRef(projectPartPch));
EXPECT_CALL(mockPrecompiledHeaderStorage,
insertProjectPrecompiledHeader(Eq(1), Eq("/path/to/pch"), 99));
insertProjectPrecompiledHeader(Eq(1), Eq("/path/to/pch"), Eq(99)));
tasks.front()(mockPchCreator);
}
@@ -377,7 +377,7 @@ TEST_F(PchTaskQueue, CreateSystemTaskFromPchTask)
EXPECT_CALL(mockPchCreator, generatePch(Eq(systemTask)));
EXPECT_CALL(mockPchCreator, projectPartPch()).WillOnce(ReturnRef(projectPartPch));
EXPECT_CALL(mockPrecompiledHeaderStorage,
insertSystemPrecompiledHeaders(UnorderedElementsAre(1, 3), Eq("/path/to/pch"), 99));
insertSystemPrecompiledHeaders(UnorderedElementsAre(1, 3), Eq("/path/to/pch"), Eq(99)));
tasks.front()(mockPchCreator);
}