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

2 files changed, 19 insertions, 16 deletions

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 <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
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 <istream>
-#include <ostream>
+  #include <istream>
+  #include <ostream>
 
 #else   // OMIM_OS_BADA
-#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
+  #include <iostream>
+
+  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;