diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx index 2c35e92b64..d0d9ca9161 100644 --- a/Source/CTest/cmCTestSubmitHandler.cxx +++ b/Source/CTest/cmCTestSubmitHandler.cxx @@ -32,8 +32,6 @@ #define SUBMIT_TIMEOUT_IN_SECONDS_DEFAULT 120 -using cmCTestSubmitHandlerVectorOfChar = std::vector; - class cmCTestSubmitHandler::ResponseParser : public cmXMLParser { public: @@ -101,8 +99,7 @@ static size_t cmCTestSubmitHandlerWriteMemoryCallback(void* ptr, size_t size, { int realsize = static_cast(size * nmemb); char const* chPtr = static_cast(ptr); - cm::append(*static_cast(data), chPtr, - chPtr + realsize); + cm::append(*static_cast*>(data), chPtr, chPtr + realsize); return realsize; } @@ -111,8 +108,7 @@ static size_t cmCTestSubmitHandlerCurlDebugCallback(CURL* /*unused*/, char* chPtr, size_t size, void* data) { - cm::append(*static_cast(data), chPtr, - chPtr + size); + cm::append(*static_cast*>(data), chPtr, chPtr + size); return 0; } @@ -321,8 +317,8 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP( cmCTestSubmitHandlerCurlDebugCallback); /* we pass our 'chunk' struct to the callback function */ - cmCTestSubmitHandlerVectorOfChar chunk; - cmCTestSubmitHandlerVectorOfChar chunkDebug; + std::vector chunk; + std::vector chunkDebug; ::curl_easy_setopt(curl, CURLOPT_FILE, &chunk); ::curl_easy_setopt(curl, CURLOPT_DEBUGDATA, &chunkDebug); @@ -447,8 +443,7 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP( return true; } -void cmCTestSubmitHandler::ParseResponse( - cmCTestSubmitHandlerVectorOfChar chunk) +void cmCTestSubmitHandler::ParseResponse(std::vector chunk) { std::string output; output.append(chunk.begin(), chunk.end()); diff --git a/Source/CTest/cmCTestSubmitHandler.h b/Source/CTest/cmCTestSubmitHandler.h index 7dee7a1186..3309a8cf78 100644 --- a/Source/CTest/cmCTestSubmitHandler.h +++ b/Source/CTest/cmCTestSubmitHandler.h @@ -53,10 +53,7 @@ private: std::vector const& files, std::string const& remoteprefix, std::string const& url); - - using cmCTestSubmitHandlerVectorOfChar = std::vector; - - void ParseResponse(cmCTestSubmitHandlerVectorOfChar chunk); + void ParseResponse(std::vector chunk); std::string GetSubmitResultsPrefix(); int GetSubmitInactivityTimeout();