build: Fixed linker problem in Linux build

This commit is contained in:
Eberhard Graether
2018-01-16 10:11:06 +01:00
parent 4c87845f8c
commit 6672127c68
4 changed files with 16 additions and 9 deletions
@@ -39,22 +39,22 @@ size_t IndexerCommandCxx::getByteSize(size_t stringSize) const
return size;
}
std::vector<FilePath> IndexerCommandCxx::getSystemHeaderSearchPaths() const
const std::vector<FilePath>& IndexerCommandCxx::getSystemHeaderSearchPaths() const
{
return m_systemHeaderSearchPaths;
}
std::vector<FilePath> IndexerCommandCxx::getFrameworkSearchPaths() const
const std::vector<FilePath>& IndexerCommandCxx::getFrameworkSearchPaths() const
{
return m_frameworkSearchPaths;
}
std::vector<std::string> IndexerCommandCxx::getCompilerFlags() const
const std::vector<std::string>& IndexerCommandCxx::getCompilerFlags() const
{
return m_compilerFlags;
}
FilePath IndexerCommandCxx::getWorkingDirectory() const
const FilePath& IndexerCommandCxx::getWorkingDirectory() const
{
return m_workingDirectory;
}
+4 -5
View File
@@ -23,11 +23,10 @@ public:
virtual size_t getByteSize(size_t stringSize) const override;
std::vector<FilePath> getSystemHeaderSearchPaths() const;
std::vector<FilePath> getFrameworkSearchPaths() const;
std::vector<std::string> getCompilerFlags() const;
FilePath getWorkingDirectory() const;
const std::vector<FilePath>& getSystemHeaderSearchPaths() const;
const std::vector<FilePath>& getFrameworkSearchPaths() const;
const std::vector<std::string>& getCompilerFlags() const;
const FilePath& getWorkingDirectory() const;
private:
FilePath m_workingDirectory;
@@ -56,3 +56,8 @@ IndexerCommandType IndexerCommandCxxCdb::getIndexerCommandType() const
{
return getStaticIndexerCommandType();
}
const FilePath& IndexerCommandCxxCdb::getWorkingDirectory() const
{
return IndexerCommandCxx::getWorkingDirectory();
}
@@ -30,6 +30,9 @@ public:
const std::vector<FilePath>& frameworkSearchPaths);
virtual IndexerCommandType getIndexerCommandType() const override;
// this method only exists to avoid a linker problem on Linux
const FilePath& getWorkingDirectory() const;
};
#endif // INDEXER_COMMAND_CXX_CDB_H