diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-30 12:58:22 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-03-30 12:58:26 (GMT) |
| commit | d66081b546c55c2066da0eac473b7a1d1d040936 (patch) | |
| tree | d5fb06e9d1671f9c17725237d40dfd5ec4ee42dc /Tests | |
| parent | 2f359787f6a5d6da20621fb1a161c8cac49902bc (diff) | |
| parent | 48cfb295a2810e541bd286f352d77d840be345f7 (diff) | |
| download | CMake-d66081b546c55c2066da0eac473b7a1d1d040936.zip CMake-d66081b546c55c2066da0eac473b7a1d1d040936.tar.gz CMake-d66081b546c55c2066da0eac473b7a1d1d040936.tar.bz2 | |
Merge topic 'iwyu'
48cfb295 cmFortranParser: remove unnecessary typedef
90bb5f64 cmCommandArgumentParserHelper: remove unnecessary include
ab5f4e81 cmFortranParserImpl: remove unnecessary include
f8ed8bef testEncoding: use cmsys::ifstream
8647c6cd testEncoding: include <cmsys/ConsoleBuf.hxx> on Windows only
21a6ed49 cmFileCommand: add <cm_curl.h> include
a2275bdd cmFileCommand: remove unnecessary friend declaration
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !626
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeLib/testEncoding.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Tests/CMakeLib/testEncoding.cxx b/Tests/CMakeLib/testEncoding.cxx index 88743b0..403c896 100644 --- a/Tests/CMakeLib/testEncoding.cxx +++ b/Tests/CMakeLib/testEncoding.cxx @@ -1,8 +1,10 @@ -#include <fstream> +#include <cmsys/FStream.hxx> #include <iostream> #include <string> +#ifdef _WIN32 #include <cmsys/ConsoleBuf.hxx> +#endif #ifdef _WIN32 void setEncoding(cmsys::ConsoleBuf::Manager& buf, UINT codepage) @@ -37,7 +39,7 @@ int main(int argc, char* argv[]) setEncoding(consoleOut, CP_OEMCP); } // else AUTO #endif - std::ifstream file(argv[2]); + cmsys::ifstream file(argv[2]); if (!file.is_open()) { std::cout << "Failed to open file: " << argv[2] << std::endl; return 2; |