From 9b476be1dfd3324e64a02a75878cd1e1b4cdefdf Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Tue, 7 Jul 2015 08:27:14 +0000
Subject: [PATCH] ide: Android builder c++11 fixes

git-svn-id: svn://ultimatepp.org/upp/trunk@8638 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/Core/Defs.h                | 3 +++
 uppsrc/ide/Android/AndroidNDK.cpp | 2 +-
 uppsrc/ide/Android/AndroidSDK.cpp | 4 ++--
 uppsrc/ide/Methods.cpp            | 2 +-
 uppsrc/ide/Methods.h              | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/uppsrc/Core/Defs.h b/uppsrc/Core/Defs.h
index c44d8bb69..47459c0e3 100644
--- a/uppsrc/Core/Defs.h
+++ b/uppsrc/Core/Defs.h
@@ -390,6 +390,9 @@ T clone(const T& x) { T c(x, 1); return c; }
 template <typename T>
 T&& pick(T& x) { return static_cast<T&&>(x); }
 
+template <typename T>
+T&& pick(T&& x) { return static_cast<T&&>(x); }
+
 #else
 
 template <class T>
diff --git a/uppsrc/ide/Android/AndroidNDK.cpp b/uppsrc/ide/Android/AndroidNDK.cpp
index f3cc321b7..2d900074f 100644
--- a/uppsrc/ide/Android/AndroidNDK.cpp
+++ b/uppsrc/ide/Android/AndroidNDK.cpp
@@ -32,7 +32,7 @@ bool AndroidNDK::Validate() const
 
 String AndroidNDK::FindDefaultToolchain() const
 {
-	Vector<String> toolchains = pick(FindToolchains());
+	Vector<String> toolchains = FindToolchains();
 	Sort(toolchains, StdGreater<String>());
 	
 	return toolchains.GetCount() ? toolchains[toolchains.GetCount() - 1] : "";
diff --git a/uppsrc/ide/Android/AndroidSDK.cpp b/uppsrc/ide/Android/AndroidSDK.cpp
index 54348beda..a2d899820 100644
--- a/uppsrc/ide/Android/AndroidSDK.cpp
+++ b/uppsrc/ide/Android/AndroidSDK.cpp
@@ -171,7 +171,7 @@ Vector<AndroidVirtualDevice> AndroidSDK::FindVirtualDevices() const
 
 String AndroidSDK::FindDefaultPlatform() const
 {
-	Vector<String> platforms = pick(FindPlatforms());
+	Vector<String> platforms = FindPlatforms();
 	if(platforms.GetCount()) {
 		Sort(platforms, StdGreater<String>());
 		int idx = 0;
@@ -188,7 +188,7 @@ String AndroidSDK::FindDefaultPlatform() const
 
 String AndroidSDK::FindDefaultBuildToolsRelease() const
 {
-	Vector<String> releases = pick(FindBuildToolsReleases());
+	Vector<String> releases = FindBuildToolsReleases();
 	if(releases.GetCount()) {
 		Sort(releases, StdGreater<String>());
 		int idx = 0;
diff --git a/uppsrc/ide/Methods.cpp b/uppsrc/ide/Methods.cpp
index 420d1576d..421ecdd41 100644
--- a/uppsrc/ide/Methods.cpp
+++ b/uppsrc/ide/Methods.cpp
@@ -250,7 +250,7 @@ void AndroidBuilderSetup::LoadCppRuntimes(const AndroidNDK& ndk)
 }
 
 void AndroidBuilderSetup::LoadDropList(DropList& dropList,
-                                       Vector<String> values,
+                                       const Vector<String>& values,
                                        const String& defaultKey)
 {
 	dropList.Clear();
diff --git a/uppsrc/ide/Methods.h b/uppsrc/ide/Methods.h
index 0d4743f70..28d80e794 100644
--- a/uppsrc/ide/Methods.h
+++ b/uppsrc/ide/Methods.h
@@ -88,7 +88,7 @@ private:
 	void LoadBuildTools(const AndroidSDK& sdk);
 	void LoadToolchains(const AndroidNDK& ndk);
 	void LoadCppRuntimes(const AndroidNDK& ndk);
-	void LoadDropList(DropList& dropList, Vector<String> values, const String& defaultKey = "");
+	void LoadDropList(DropList& dropList, const Vector<String>& values, const String& defaultKey = "");
 };
 
 class BuilderSetup {