From 6672127c68712a2c750b7cd6c0e38370b0cc681b Mon Sep 17 00:00:00 2001
From: Eberhard Graether <egraether@gmail.com>
Date: Tue, 16 Jan 2018 10:11:06 +0100
Subject: [PATCH] build: Fixed linker problem in Linux build

---
 src/lib_cxx/data/indexer/IndexerCommandCxx.cpp    | 8 ++++----
 src/lib_cxx/data/indexer/IndexerCommandCxx.h      | 9 ++++-----
 src/lib_cxx/data/indexer/IndexerCommandCxxCdb.cpp | 5 +++++
 src/lib_cxx/data/indexer/IndexerCommandCxxCdb.h   | 3 +++
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/lib_cxx/data/indexer/IndexerCommandCxx.cpp b/src/lib_cxx/data/indexer/IndexerCommandCxx.cpp
index 7fef9032..4d12de17 100644
--- a/src/lib_cxx/data/indexer/IndexerCommandCxx.cpp
+++ b/src/lib_cxx/data/indexer/IndexerCommandCxx.cpp
@@ -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;
 }
diff --git a/src/lib_cxx/data/indexer/IndexerCommandCxx.h b/src/lib_cxx/data/indexer/IndexerCommandCxx.h
index b60a9e2e..3b392edb 100644
--- a/src/lib_cxx/data/indexer/IndexerCommandCxx.h
+++ b/src/lib_cxx/data/indexer/IndexerCommandCxx.h
@@ -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;
diff --git a/src/lib_cxx/data/indexer/IndexerCommandCxxCdb.cpp b/src/lib_cxx/data/indexer/IndexerCommandCxxCdb.cpp
index 955dd81d..f27a6b6a 100644
--- a/src/lib_cxx/data/indexer/IndexerCommandCxxCdb.cpp
+++ b/src/lib_cxx/data/indexer/IndexerCommandCxxCdb.cpp
@@ -56,3 +56,8 @@ IndexerCommandType IndexerCommandCxxCdb::getIndexerCommandType() const
 {
 	return getStaticIndexerCommandType();
 }
+
+const FilePath& IndexerCommandCxxCdb::getWorkingDirectory() const
+{
+	return IndexerCommandCxx::getWorkingDirectory();
+}
diff --git a/src/lib_cxx/data/indexer/IndexerCommandCxxCdb.h b/src/lib_cxx/data/indexer/IndexerCommandCxxCdb.h
index 67baedd7..7aa8e70f 100644
--- a/src/lib_cxx/data/indexer/IndexerCommandCxxCdb.h
+++ b/src/lib_cxx/data/indexer/IndexerCommandCxxCdb.h
@@ -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