diff options
| author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2018-09-26 19:26:47 +0300 |
|---|---|---|
| committer | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2018-09-26 19:36:06 +0300 |
| commit | 778d0781bc810ba4ce51d63946baeb6f69d5007a (patch) | |
| tree | eeddc085d0dca297a7177f5d3b2c9a64be6a7ae6 /drape/drape_tests | |
| parent | 14c36ba25cc91bace796d874186832efe2c6f6bf (diff) | |
Drape test fix.
Diffstat (limited to 'drape/drape_tests')
| -rw-r--r-- | drape/drape_tests/testingmain.cpp | 6 | ||||
| -rw-r--r-- | drape/drape_tests/uniform_value_tests.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drape/drape_tests/testingmain.cpp b/drape/drape_tests/testingmain.cpp index 3162df67c7..33b1f03b60 100644 --- a/drape/drape_tests/testingmain.cpp +++ b/drape/drape_tests/testingmain.cpp @@ -100,13 +100,13 @@ int main(int argc, char * argv[]) } catch (std::exception const & ex) { - std::cerr << "FAILED" << endl << "<<<Exception thrown [" << ex.what() << "].>>>" << std::endl; + std::cerr << "FAILED" << std::endl << "<<<Exception thrown [" << ex.what() << "].>>>" << std::endl; testResults[iTest] = false; ++numFailedTests; } catch (...) { - std::cerr << "FAILED" << endl << "<<<Unknown exception thrown.>>>" << std::endl; + std::cerr << "FAILED" << std::endl << "<<<Unknown exception thrown.>>>" << std::endl; testResults[iTest] = false; ++numFailedTests; } @@ -126,7 +126,7 @@ int main(int argc, char * argv[]) if (!testResults[i]) std::cerr << testNames[i] << std::endl; } - std::cerr << "Some tests FAILED." << std::endl << flush; + std::cerr << "Some tests FAILED." << std::endl << std::flush; return 1; } } diff --git a/drape/drape_tests/uniform_value_tests.cpp b/drape/drape_tests/uniform_value_tests.cpp index b7876ab1cc..8318cdc507 100644 --- a/drape/drape_tests/uniform_value_tests.cpp +++ b/drape/drape_tests/uniform_value_tests.cpp @@ -54,7 +54,7 @@ void mock_glGetActiveUniform(uint32_t programID, uint32_t index, int32_t * size, *size = 1; if (index < 9) { - static std::pair<string, glConst> mockUniforms[9] = + static std::pair<std::string, glConst> mockUniforms[9] = { std::make_pair("position0", gl_const::GLIntType), std::make_pair("position1", gl_const::GLIntVec2), |