X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftest-trace-call-stack.cpp;h=f8943894c3e01519ea388944bbe731bf2f6ae042;hp=76ccff75570e50ffe524aa3b69f8138b0696d157;hb=07a73413cfefa18105d94f952efb62884b8ed9a1;hpb=f871dce5373ce3d4f414963a68505eefc0d49cd2 diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-trace-call-stack.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-trace-call-stack.cpp index 76ccff7..f894389 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-trace-call-stack.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-trace-call-stack.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -164,14 +164,14 @@ bool TraceCallStack::FindMethodAndParamsFromStartIndex( std::string method, std: * @param[in] params A comma separated list of parameter values * @return index in the stack where the method was found or -1 otherwise */ -int TraceCallStack::FindIndexFromMethodAndParams(std::string method, std::string params) const +int32_t TraceCallStack::FindIndexFromMethodAndParams(std::string method, std::string params) const { - int index = -1; + int32_t index = -1; for( size_t i=0; i < mCallStack.size(); i++ ) { if( 0 == mCallStack[i].method.compare(method) && 0 == mCallStack[i].paramList.compare(params) ) { - index = i; + index = static_cast( i ); break; } } @@ -180,7 +180,7 @@ int TraceCallStack::FindIndexFromMethodAndParams(std::string method, std::string int TraceCallStack::FindIndexFromMethodAndParams(std::string method, const TraceCallStack::NamedParams& params) const { - int index = -1; + int32_t index = -1; for( size_t i=0; i < mCallStack.size(); i++ ) { if( 0 == mCallStack[i].method.compare(method) ) @@ -198,7 +198,7 @@ int TraceCallStack::FindIndexFromMethodAndParams(std::string method, const Trace } if( match == true ) { - index = i; + index = static_cast( i ); break; } }