From 0218b4973ef5a865c64764bc7f1c984baa061031 Mon Sep 17 00:00:00 2001 From: vng Date: Thu, 10 May 2012 18:03:56 +0300 Subject: [PATCH] Move istream, ostream from "fstream.hpp" to "iostream.hpp". --- coding/coding_tests/reader_test.cpp | 2 +- generator/generator_tool/generator_tool.cpp | 1 + indexer/categories_holder.hpp | 2 +- indexer/classificator.cpp | 2 +- indexer/classificator.hpp | 2 +- indexer/classificator_loader.cpp | 1 + indexer/drawing_rules.hpp | 2 +- indexer/tree_structure.hpp | 2 +- indexer/types_mapping.hpp | 2 +- platform/settings.cpp | 2 +- std/fstream.hpp | 7 +++--- std/iostream.hpp | 26 ++++++++++++--------- 12 files changed, 28 insertions(+), 23 deletions(-) diff --git a/coding/coding_tests/reader_test.cpp b/coding/coding_tests/reader_test.cpp index 225ae83335..efa95a8249 100644 --- a/coding/coding_tests/reader_test.cpp +++ b/coding/coding_tests/reader_test.cpp @@ -8,7 +8,7 @@ #include "../buffer_reader.hpp" #include "../reader_streambuf.hpp" -#include "../../std/fstream.hpp" +#include "../../std/iostream.hpp" namespace diff --git a/generator/generator_tool/generator_tool.cpp b/generator/generator_tool/generator_tool.cpp index d56bf11f93..02a45481a1 100644 --- a/generator/generator_tool/generator_tool.cpp +++ b/generator/generator_tool/generator_tool.cpp @@ -24,6 +24,7 @@ #include "../../3party/gflags/src/gflags/gflags.h" #include "../../std/iostream.hpp" +#include "../../std/fstream.hpp" #include "../../std/iomanip.hpp" #include "../../std/numeric.hpp" diff --git a/indexer/categories_holder.hpp b/indexer/categories_holder.hpp index 0bbddf6c63..ab62ca0d21 100644 --- a/indexer/categories_holder.hpp +++ b/indexer/categories_holder.hpp @@ -4,7 +4,7 @@ #include "../std/vector.hpp" #include "../std/map.hpp" #include "../std/string.hpp" -#include "../std/fstream.hpp" +#include "../std/iostream.hpp" #include "../std/shared_ptr.hpp" diff --git a/indexer/classificator.cpp b/indexer/classificator.cpp index f23823e374..e671978bc9 100644 --- a/indexer/classificator.cpp +++ b/indexer/classificator.cpp @@ -1,4 +1,3 @@ -#include "../base/SRC_FIRST.hpp" #include "classificator.hpp" #include "tree_structure.hpp" @@ -10,6 +9,7 @@ #include "../std/bind.hpp" #include "../std/algorithm.hpp" #include "../std/iterator.hpp" +#include "../std/fstream.hpp" ///////////////////////////////////////////////////////////////////////////////////////// diff --git a/indexer/classificator.hpp b/indexer/classificator.hpp index 01d5a6adb8..930dc59ae9 100644 --- a/indexer/classificator.hpp +++ b/indexer/classificator.hpp @@ -6,7 +6,7 @@ #include "../std/vector.hpp" #include "../std/string.hpp" -#include "../std/fstream.hpp" +#include "../std/iostream.hpp" #include "../std/bitset.hpp" diff --git a/indexer/classificator_loader.cpp b/indexer/classificator_loader.cpp index b54ddf35a2..5dcf4edb40 100644 --- a/indexer/classificator_loader.cpp +++ b/indexer/classificator_loader.cpp @@ -10,6 +10,7 @@ #include "../base/logging.hpp" +#include "../std/iostream.hpp" #include "../std/fstream.hpp" diff --git a/indexer/drawing_rules.hpp b/indexer/drawing_rules.hpp index 648e64542a..a596e36295 100644 --- a/indexer/drawing_rules.hpp +++ b/indexer/drawing_rules.hpp @@ -8,7 +8,7 @@ #include "../std/vector.hpp" #include "../std/array.hpp" #include "../std/string.hpp" -#include "../std/fstream.hpp" +#include "../std/iostream.hpp" class LineDefProto; diff --git a/indexer/tree_structure.hpp b/indexer/tree_structure.hpp index 605fbd2c30..6d96d8a645 100644 --- a/indexer/tree_structure.hpp +++ b/indexer/tree_structure.hpp @@ -2,7 +2,7 @@ #include "../base/assert.hpp" -#include "../std/fstream.hpp" +#include "../std/iostream.hpp" namespace tree diff --git a/indexer/types_mapping.hpp b/indexer/types_mapping.hpp index 2b61e35cb5..d33a20e1f3 100644 --- a/indexer/types_mapping.hpp +++ b/indexer/types_mapping.hpp @@ -3,7 +3,7 @@ #include "../std/vector.hpp" #include "../std/map.hpp" -#include "../std/fstream.hpp" +#include "../std/iostream.hpp" class IndexAndTypeMapping diff --git a/platform/settings.cpp b/platform/settings.cpp index d5ba507737..d3542fe283 100644 --- a/platform/settings.cpp +++ b/platform/settings.cpp @@ -14,7 +14,7 @@ #include "../platform/platform.hpp" #include "../std/sstream.hpp" -#include "../std/fstream.hpp" +#include "../std/iostream.hpp" #define DELIM_CHAR '=' diff --git a/std/fstream.hpp b/std/fstream.hpp index 44b8929274..2e908221f3 100644 --- a/std/fstream.hpp +++ b/std/fstream.hpp @@ -10,12 +10,11 @@ #include #else #include + + using std::ofstream; + using std::ifstream; #endif -using std::ofstream; -using std::ostream; -using std::ifstream; -using std::istream; using std::ios; #ifdef DEBUG_NEW diff --git a/std/iostream.hpp b/std/iostream.hpp index 7e56b9e9b2..d944705db8 100644 --- a/std/iostream.hpp +++ b/std/iostream.hpp @@ -7,20 +7,24 @@ #endif #ifdef OMIM_OS_BADA -#include -#include + #include + #include #else // OMIM_OS_BADA -#include + #include -using std::cin; -using std::cout; -using std::cerr; -#ifndef OMIM_OS_ANDROID -using std::wcin; -using std::wcout; -using std::wcerr; -#endif + using std::cin; + using std::cout; + using std::cerr; + + using std::istream; + using std::ostream; + + #ifndef OMIM_OS_ANDROID + using std::wcin; + using std::wcout; + using std::wcerr; + #endif #endif // OMIM_OS_BADA using std::endl;