Removing 'use std::vector'

This commit is contained in:
baldurk
2019-05-17 15:25:28 +01:00
parent 725c207ec8
commit 7206a0cd25
118 changed files with 731 additions and 738 deletions
+4 -7
View File
@@ -41,9 +41,6 @@ extern "C" {
#include <android/log.h>
#define ANDROID_LOG(...) __android_log_print(ANDROID_LOG_INFO, "renderdoccmd", __VA_ARGS__);
using std::vector;
using std::istringstream;
struct android_app *android_state;
pthread_t cmdthread_handle = 0;
@@ -377,7 +374,7 @@ void DisplayRendererPreview(IReplayController *renderer, TextureDisplay &display
// Returns the renderdoccmd arguments passed via am start
// Examples: am start ... -e renderdoccmd "remoteserver"
// -e renderdoccmd "replay /sdcard/capture.rdc"
vector<std::string> getRenderdoccmdArgs()
std::vector<std::string> getRenderdoccmdArgs()
{
JNIEnv *env;
android_state->activity->vm->AttachCurrentThread(&env, 0);
@@ -395,12 +392,12 @@ vector<std::string> getRenderdoccmdArgs()
jstring jsParam1 =
(jstring)env->CallObjectMethod(intent, gseid, env->NewStringUTF("renderdoccmd"));
vector<std::string> ret;
std::vector<std::string> ret;
if(jsParam1) // Check if arg value found
{
ret.push_back("renderdoccmd");
const char *param1 = env->GetStringUTFChars(jsParam1, 0);
istringstream iss(param1);
std::istringstream iss(param1);
while(iss)
{
std::string sub;
@@ -415,7 +412,7 @@ vector<std::string> getRenderdoccmdArgs()
void *cmdthread(void *)
{
vector<std::string> args = getRenderdoccmdArgs();
std::vector<std::string> args = getRenderdoccmdArgs();
if(args.size())
{
ANDROID_LOG("Entering cmd thread");