compile maya5.0

pandatool/src/maya/post_maya_include.h

@@ -19,6 +19,8 @@
 // This header file works in conjunction with pre_maya_include.h; it
 // cleans up some of the definitions that it left open.
 
-// Remove the symbols defined from pre_maya_include.h.
-#undef ostream
-#undef istream
+// This header is no longer necessary owing to the existence of
+// REQUIRE_IOSTREAM in Maya5.0.  We'll keep it around for now in case
+// we ever need it again.
+
+

pandatool/src/maya/pre_maya_include.h

@@ -27,23 +27,10 @@
 #define _BOOL 1
 #endif
 
-// Maya tries to make a forward declaration for class ostream, but
-// this is not necessarily a class!  Curses.  We can't use any of the
-// built-in Maya stream operators, and we have to protect ourselves
-// from them.
-
 // In Maya 5.0, the headers seem to provide the manifest
 // REQUIRE_IOSTREAM, which forces it to use the new <iostream> headers
 // instead of the old <iostream.h> headers.  It also says this is for
-// Linux only.
-#ifdef __GNUC__
-#ifndef PRE_MAYA_INCLUDE_H
-#define PRE_MAYA_INCLUDE_H
+// Linux only, but it seems to work just fine on Windows, obviating
+// the need for sneaky #defines in this and in post_maya_include.h.
 #define REQUIRE_IOSTREAM
-#endif
-#else  // __GNUC__
-
-#define ostream maya_ostream
-#define istream maya_istream
 
-#endif  // __GNUC__