Move istream, ostream from "fstream.hpp" to "iostream.hpp".

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

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"
 

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"
 
 

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"
 
 
 /////////////////////////////////////////////////////////////////////////////////////////

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"
 
 

indexer/classificator_loader.cpp

@@ -10,6 +10,7 @@
 
 #include "../base/logging.hpp"
 
+#include "../std/iostream.hpp"
 #include "../std/fstream.hpp"
 
 

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;

indexer/tree_structure.hpp

@@ -2,7 +2,7 @@
 
 #include "../base/assert.hpp"
 
-#include "../std/fstream.hpp"
+#include "../std/iostream.hpp"
 
 
 namespace tree

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

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  '='

std/fstream.hpp

@@ -10,12 +10,11 @@
   #include <ios>
 #else
   #include <fstream>
+
+  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

std/iostream.hpp

@@ -7,20 +7,24 @@
 #endif
 
 #ifdef OMIM_OS_BADA
-#include <istream>
-#include <ostream>
+  #include <istream>
+  #include <ostream>
 
 #else   // OMIM_OS_BADA
-#include <iostream>
+  #include <iostream>
 
-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;