github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-23 06:13:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Android builder c++11 fixes

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8638 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-07-07 08:27:14 +00:00
parent 2dfcea4e06
commit 9b476be1df
5 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
uppsrc/Core/Defs.h
View file

@ -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>

2
uppsrc/ide/Android/AndroidNDK.cpp
View file

@ -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] : "";

4
uppsrc/ide/Android/AndroidSDK.cpp
View file

@ -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;

2
uppsrc/ide/Methods.cpp
View file

@ -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();

2
uppsrc/ide/Methods.h
View file

@ -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 {