From 90f8265497201619efffe9dc8a9ffc99ccb880b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Lam?= <leo@innovatetechnologi.es>
Date: Wed, 5 Jul 2017 13:49:33 +0200
Subject: [PATCH] Replace StringFromInt with std::to_string

Updated version of #47. Android should support to_string now that
we use a modern version of libc++ when building.
---
 Source/Core/Common/Config/Section.cpp       | 2 +-
 Source/Core/Common/IniFile.cpp              | 2 +-
 Source/Core/Common/StringUtil.cpp           | 7 -------
 Source/Core/Common/StringUtil.h             | 1 -
 Source/Core/Core/HW/WiimoteReal/IOAndroid.h | 3 ++-
 5 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/Source/Core/Common/Config/Section.cpp b/Source/Core/Common/Config/Section.cpp
index ac6741416a..7db2c557ea 100644
--- a/Source/Core/Common/Config/Section.cpp
+++ b/Source/Core/Common/Config/Section.cpp
@@ -71,7 +71,7 @@ void Section::Set(const std::string& key, double newValue)
 
 void Section::Set(const std::string& key, int newValue)
 {
-  Section::Set(key, StringFromInt(newValue));
+  Section::Set(key, std::to_string(newValue));
 }
 
 void Section::Set(const std::string& key, bool newValue)
diff --git a/Source/Core/Common/IniFile.cpp b/Source/Core/Common/IniFile.cpp
index 5c38dd6a19..ddaf64b0e3 100644
--- a/Source/Core/Common/IniFile.cpp
+++ b/Source/Core/Common/IniFile.cpp
@@ -93,7 +93,7 @@ void IniFile::Section::Set(const std::string& key, double newValue)
 
 void IniFile::Section::Set(const std::string& key, int newValue)
 {
-  Set(key, StringFromInt(newValue));
+  Set(key, std::to_string(newValue));
 }
 
 void IniFile::Section::Set(const std::string& key, s64 newValue)
diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp
index 1536173eb7..03e6bb3d45 100644
--- a/Source/Core/Common/StringUtil.cpp
+++ b/Source/Core/Common/StringUtil.cpp
@@ -283,13 +283,6 @@ bool TryParse(const std::string& str, bool* const output)
   return true;
 }
 
-std::string StringFromInt(int value)
-{
-  char temp[16];
-  sprintf(temp, "%i", value);
-  return temp;
-}
-
 std::string StringFromBool(bool value)
 {
   return value ? "True" : "False";
diff --git a/Source/Core/Common/StringUtil.h b/Source/Core/Common/StringUtil.h
index b4c65370d3..f9a767e700 100644
--- a/Source/Core/Common/StringUtil.h
+++ b/Source/Core/Common/StringUtil.h
@@ -56,7 +56,6 @@ std::string ThousandSeparate(I value, int spaces = 0)
   return oss.str();
 }
 
-std::string StringFromInt(int value);
 std::string StringFromBool(bool value);
 
 bool TryParse(const std::string& str, bool* output);
diff --git a/Source/Core/Core/HW/WiimoteReal/IOAndroid.h b/Source/Core/Core/HW/WiimoteReal/IOAndroid.h
index 3f28e532ac..31a8863aeb 100644
--- a/Source/Core/Core/HW/WiimoteReal/IOAndroid.h
+++ b/Source/Core/Core/HW/WiimoteReal/IOAndroid.h
@@ -6,6 +6,7 @@
 
 #ifdef ANDROID
 #include <jni.h>
+#include <string>
 
 #include "Common/StringUtil.h"
 #include "Core/HW/WiimoteReal/WiimoteReal.h"
@@ -17,7 +18,7 @@ class WiimoteAndroid final : public Wiimote
 public:
   WiimoteAndroid(int index);
   ~WiimoteAndroid() override;
-  std::string GetId() const override { return "Android " + StringFromInt(m_mayflash_index); }
+  std::string GetId() const override { return "Android " + std::to_string(m_mayflash_index); }
 protected:
   bool ConnectInternal() override;
   void DisconnectInternal() override;