From 513be1d83b4e5a322ae51a3501f2600f98fbc8ad Mon Sep 17 00:00:00 2001
From: ganovelli <fabio.ganovelli@isti.cnr.it>
Date: Fri, 30 Oct 2009 17:51:40 +0000
Subject: [PATCH] changed errormsg names for conflicts with already defined
 names

---
 wrap/io_trimesh/import_vmi.h | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/wrap/io_trimesh/import_vmi.h b/wrap/io_trimesh/import_vmi.h
index 1eb7ff5a..fdd66d5e 100644
--- a/wrap/io_trimesh/import_vmi.h
+++ b/wrap/io_trimesh/import_vmi.h
@@ -544,12 +544,12 @@ namespace io {
 		typedef typename OpenMeshType::VertexType VertexType;
 
 	public:
-   enum VMIErrorCodes {
-            NO_ERROR=0,
-            INCOMPATIBLE_VERTEX_TYPE,
-            INCOMPATIBLE_FACE_TYPE,
-            FAILED_OPEN
-        };
+	   enum VMIErrorCodes { 
+				VMI_NO_ERROR = 0,
+				VMI_INCOMPATIBLE_VERTEX_TYPE,
+				VMI_INCOMPATIBLE_FACE_TYPE,
+				VMI_FAILED_OPEN
+	   };
 
         /*!
          *	Standard call for knowing the meaning of an error code
@@ -622,7 +622,7 @@ namespace io {
 			typename OpenMeshType::FaceIterator fi;
 			typename OpenMeshType::VertexIterator vi;
 			F() = fopen(filename,"rb");
-            if(!F()) return FAILED_OPEN;
+            if(!F()) return VMI_FAILED_OPEN;
 			std::vector<std::string> nameF,nameV,fnameF,fnameV;
 			unsigned int vertSize,faceSize;
 
@@ -634,8 +634,8 @@ namespace io {
 			OpenMeshType::VertexType::Name(nameV);
 
 			/* check if the type is the very same, otherwise return */
-            if(fnameV != nameV) return INCOMPATIBLE_VERTEX_TYPE;
-            if(fnameF != nameF) return INCOMPATIBLE_FACE_TYPE;
+            if(fnameV != nameV) return VMI_INCOMPATIBLE_VERTEX_TYPE;
+            if(fnameF != nameF) return VMI_INCOMPATIBLE_FACE_TYPE;
 
 			 int offsetV,offsetF;
 
@@ -748,7 +748,7 @@ namespace io {
 				}
 
 				fclose(F());
-                return NO_ERROR; // zero is the standard (!) code of success
+                return VMI_NO_ERROR; // zero is the standard (!) code of success
 		} 
 
 	}; // end class