summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@qt.io>2019-07-25 13:34:07 +0200
committerMarco Bubke <marco.bubke@qt.io>2019-08-27 11:49:48 +0000
commit0fe6811acd74011d2bb27c01fc56987c5bcd9510 (patch)
tree429cb557743a53f49bc19f4017baf873c3f79206 /src/tools
parent1e703a690136786b4e6ee7ca0c6a950682110fba (diff)
downloadqt-creator-0fe6811acd74011d2bb27c01fc56987c5bcd9510.tar.gz
ClangPchManager: Use TimeStamp instead of long long
Change-Id: If8a429238d31492506c68bb523ceeb4bacad157e Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/clangpchmanagerbackend/source/precompiledheaderstorage.h12
-rw-r--r--src/tools/clangpchmanagerbackend/source/precompiledheaderstorageinterface.h7
-rw-r--r--src/tools/clangrefactoringbackend/source/indexdataconsumer.cpp2
3 files changed, 11 insertions, 10 deletions
diff --git a/src/tools/clangpchmanagerbackend/source/precompiledheaderstorage.h b/src/tools/clangpchmanagerbackend/source/precompiledheaderstorage.h
index 085e146d18..16a956b2ad 100644
--- a/src/tools/clangpchmanagerbackend/source/precompiledheaderstorage.h
+++ b/src/tools/clangpchmanagerbackend/source/precompiledheaderstorage.h
@@ -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) {
diff --git a/src/tools/clangpchmanagerbackend/source/precompiledheaderstorageinterface.h b/src/tools/clangpchmanagerbackend/source/precompiledheaderstorageinterface.h
index f2c000072f..bafbc7ace8 100644
--- a/src/tools/clangpchmanagerbackend/source/precompiledheaderstorageinterface.h
+++ b/src/tools/clangpchmanagerbackend/source/precompiledheaderstorageinterface.h
@@ -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;
diff --git a/src/tools/clangrefactoringbackend/source/indexdataconsumer.cpp b/src/tools/clangrefactoringbackend/source/indexdataconsumer.cpp
index 68f2f77156..00ad465bcc 100644
--- a/src/tools/clangrefactoringbackend/source/indexdataconsumer.cpp
+++ b/src/tools/clangrefactoringbackend/source/indexdataconsumer.cpp
@@ -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)
{