Merge "Revert "Force all compilation units initialize cout (...etc) global objects before use.""
diff --git a/sources/cxx-stl/stlport/src/locale_impl.cpp b/sources/cxx-stl/stlport/src/locale_impl.cpp
index 33454ea..71e0864 100644
--- a/sources/cxx-stl/stlport/src/locale_impl.cpp
+++ b/sources/cxx-stl/stlport/src/locale_impl.cpp
@@ -618,6 +618,8 @@
# pragma init_seg(lib)
#endif
+static ios_base::Init _IosInit;
+
void _Locale_impl::make_classic_locale() {
// This funcion will be called once: during build classic _Locale_impl
diff --git a/sources/cxx-stl/stlport/stlport/stl/_ios_base.h b/sources/cxx-stl/stlport/stlport/stl/_ios_base.h
index 30425d2..8c7a65b 100644
--- a/sources/cxx-stl/stlport/stlport/stl/_ios_base.h
+++ b/sources/cxx-stl/stlport/stlport/stl/_ios_base.h
@@ -261,8 +261,6 @@
# endif
};
-static ios_base::Init _IosInit;
-
// ----------------------------------------------------------------------
// ios_base manipulator functions, from section 27.4.5 of the C++ standard.
// All of them are trivial one-line wrapper functions.
