From 89ac40c59b844da9d2e438b46ad88e7213ce2dcd Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Mon, 29 Sep 2003 21:21:28 +0000
Subject: [PATCH] compile maya 5.0 on irix

---
 pandatool/src/maya/maya_funcs.cxx     | 44 +++++++++++++--------------
 pandatool/src/maya/pre_maya_include.h |  2 ++
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/pandatool/src/maya/maya_funcs.cxx b/pandatool/src/maya/maya_funcs.cxx
index 5f09c83834..75b60025c2 100644
--- a/pandatool/src/maya/maya_funcs.cxx
+++ b/pandatool/src/maya/maya_funcs.cxx
@@ -328,7 +328,8 @@ get_enum_attribute(MObject &node, const string &attribute_name,
     return false;
   }
 
-  MFnEnumAttribute enum_attrib(plug.attribute(), &status);
+  MObject attrib = plug.attribute();
+  MFnEnumAttribute enum_attrib(attrib, &status);
   if (!status) {
     maya_cat.error()
       << "Not an enum attribute: " << attribute_name << "\n";
@@ -466,67 +467,66 @@ string_mfndata_type(MFnData::Type type) {
   switch (type) {
   case MFnData::kInvalid:
     return "kInvalid";
-    break;
+
   case MFnData::kNumeric:
     return "kNumeric";
-    break;
+
   case MFnData::kPlugin:
     return "kPlugin";
-    break;
+
   case MFnData::kPluginGeometry:
     return "kPluginGeometry";
-    break;
+
   case MFnData::kString:
     return "kString";
-    break;
+
   case MFnData::kMatrix:
     return "kMatrix";
-    break;
+
   case MFnData::kStringArray:
     return "kStringArray";
-    break;
+
   case MFnData::kDoubleArray:
     return "kDoubleArray";
-    break;
+
   case MFnData::kIntArray:
     return "kIntArray";
-    break;
+
   case MFnData::kPointArray:
     return "kPointArray";
-    break;
+
   case MFnData::kVectorArray:
     return "kVectorArray";
-    break;
+
   case MFnData::kComponentList:
     return "kComponentList";
-    break;
+
   case MFnData::kMesh:
     return "kMesh";
-    break;
+
   case MFnData::kLattice:
     return "kLattice";
-    break;
+
   case MFnData::kNurbsCurve:
     return "kNurbsCurve";
-    break;
+
   case MFnData::kNurbsSurface:
     return "kNurbsSurface";
-    break;
+
   case MFnData::kSphere:
     return "kSphere";
-    break;
+
   case MFnData::kDynArrayAttrs:
     return "kDynArrayAttrs";
-    break;
+
   case MFnData::kDynSweptGeometry:
     return "kDynSweptGeometry";
-    break;
+
   case MFnData::kSubdSurface:
     return "kSubdSurface";
-    break;
+
   case MFnData::kLast:
     return "kLast";
-    break;
   }
 
   return "**invalid**";
diff --git a/pandatool/src/maya/pre_maya_include.h b/pandatool/src/maya/pre_maya_include.h
index 4e1edba418..ed195b89ca 100644
--- a/pandatool/src/maya/pre_maya_include.h
+++ b/pandatool/src/maya/pre_maya_include.h
@@ -32,5 +32,7 @@
 // instead of the old <iostream.h> headers.  It also says this is for
 // 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.
+#ifdef HAVE_IOSTREAM
 #define REQUIRE_IOSTREAM
+#endif  // HAVE_IOSTREAM