include wx/beforestd.h before iostream headers to avoid problems with visibility...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/tex2rtf/src/table.cpp b/utils/tex2rtf/src/table.cpp
index 55a8e68279798f6f035b71d0ab81e8b9c4c71bb0..57750d36a4d98dbac50ce51f2a5b03da22e18425 100644 (file)
--- a/utils/tex2rtf/src/table.cpp
+++ b/utils/tex2rtf/src/table.cpp
@@ -26,6 +26,7 @@
 #undef new
 #endif
 
+#include "wx/beforestd.h"
 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #include <fstream.h>
@@ -33,6 +34,7 @@
 #include <iostream>
 #include <fstream>
 #endif
+#include "wx/afterstd.h"
 
 #include <ctype.h>
 #include "tex2any.h"

diff --git a/utils/tex2rtf/src/tex2rtf.cpp b/utils/tex2rtf/src/tex2rtf.cpp
index 55e7af99d8e774caf856284e914256f0bba57a0d..39275757730ec8690f306044232ecb7160f534f8 100644 (file)
--- a/utils/tex2rtf/src/tex2rtf.cpp
+++ b/utils/tex2rtf/src/tex2rtf.cpp
@@ -47,6 +47,7 @@
 
 #include "wx/utils.h"
 
+#include "wx/beforestd.h"
 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #include <fstream.h>
@@ -54,6 +55,7 @@
 #include <iostream>
 #include <fstream>
 #endif
+#include "wx/afterstd.h"
 
 #include <ctype.h>
 #include <stdlib.h>

diff --git a/utils/tex2rtf/src/texutils.cpp b/utils/tex2rtf/src/texutils.cpp
index 4133290545e73ad2c6d89c372026548bfbd9f7cc..5bf4838829c9f6b69a579667e6b44a9b832fc5ea 100644 (file)
--- a/utils/tex2rtf/src/texutils.cpp
+++ b/utils/tex2rtf/src/texutils.cpp
@@ -29,6 +29,7 @@
 #undef new
 #endif
 
+#include "wx/beforestd.h"
 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #include <fstream.h>
@@ -37,6 +38,7 @@
 #include <fstream>
 using namespace std;
 #endif
+#include "wx/afterstd.h"
 
 #include <ctype.h>
 #include "tex2any.h"