From d4e58085243f27bcdef51eecdf37b27a6c49e663 Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Tue, 16 May 2017 16:30:50 +0200 Subject: [PATCH] src: Fixed clang issues --- src/lib/data/SqliteBookmarkStorage.cpp | 2 +- src/lib/data/indexer/IndexerComposite.h | 4 ++-- src/lib_cxx/data/indexer/IndexerCommandCxxCdb.h | 2 +- src/lib_cxx/data/indexer/IndexerCommandCxxManual.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/data/SqliteBookmarkStorage.cpp b/src/lib/data/SqliteBookmarkStorage.cpp index 51d97c9a..94da3696 100644 --- a/src/lib/data/SqliteBookmarkStorage.cpp +++ b/src/lib/data/SqliteBookmarkStorage.cpp @@ -32,7 +32,7 @@ void SqliteBookmarkStorage::migrateIfNecessary() migration->executeStatementInStorage(storage, "UPDATE bookmarked_edge SET serialized_target_node_name = '::\tm' || serialized_target_node_name"); })); - bool migrated = migrator.migrate(this, SqliteBookmarkStorage::s_storageVersion); + migrator.migrate(this, SqliteBookmarkStorage::s_storageVersion); } Id SqliteBookmarkStorage::addBookmarkCategory(const std::string& name) diff --git a/src/lib/data/indexer/IndexerComposite.h b/src/lib/data/indexer/IndexerComposite.h index 004032f3..843ecab9 100644 --- a/src/lib/data/indexer/IndexerComposite.h +++ b/src/lib/data/indexer/IndexerComposite.h @@ -1,8 +1,8 @@ #ifndef INDEXER_COMPOSITE_H #define INDEXER_COMPOSITE_H +#include #include -#include #include "data/indexer/IndexerBase.h" @@ -23,7 +23,7 @@ public: virtual void interrupt(); private: - std::unordered_map> m_indexers; + std::map> m_indexers; }; #endif // INDEXER_COMPOSITE_H diff --git a/src/lib_cxx/data/indexer/IndexerCommandCxxCdb.h b/src/lib_cxx/data/indexer/IndexerCommandCxxCdb.h index dc2d0aff..31e4059b 100644 --- a/src/lib_cxx/data/indexer/IndexerCommandCxxCdb.h +++ b/src/lib_cxx/data/indexer/IndexerCommandCxxCdb.h @@ -31,7 +31,7 @@ public: virtual ~IndexerCommandCxxCdb(); virtual IndexerCommandType getIndexerCommandType() const override; - virtual size_t getByteSize() const; + virtual size_t getByteSize() const override; FilePath getWorkingDirectory() const; diff --git a/src/lib_cxx/data/indexer/IndexerCommandCxxManual.h b/src/lib_cxx/data/indexer/IndexerCommandCxxManual.h index c7c60ea2..f09bcec9 100644 --- a/src/lib_cxx/data/indexer/IndexerCommandCxxManual.h +++ b/src/lib_cxx/data/indexer/IndexerCommandCxxManual.h @@ -23,7 +23,7 @@ public: virtual ~IndexerCommandCxxManual(); virtual IndexerCommandType getIndexerCommandType() const override; - virtual size_t getByteSize() const; + virtual size_t getByteSize() const override; std::string getLanguageStandard() const;