[MOAB-dev] r3417 - in MOAB/trunk: . tools/iMesh

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2009-12-16 13:50:46 -0600 (Wed, 16 Dec 2009)
New Revision: 3417

Modified:
   MOAB/trunk/BSPTreePoly.cpp
   MOAB/trunk/ReadIDEAS.cpp
   MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp
Log:
fix a few warnings

Modified: MOAB/trunk/BSPTreePoly.cpp
===================================================================
--- MOAB/trunk/BSPTreePoly.cpp	2009-12-16 19:45:23 UTC (rev 3416)
+++ MOAB/trunk/BSPTreePoly.cpp	2009-12-16 19:50:46 UTC (rev 3417)
@@ -146,8 +146,8 @@
 #endif
 }
 
-static void merge_edges( BSPTreePoly::Edge* keep_edge,
-                         BSPTreePoly::Edge* dead_edge );
+//static void merge_edges( BSPTreePoly::Edge* keep_edge,
+//                         BSPTreePoly::Edge* dead_edge );
 
 static BSPTreePoly::Edge* split_edge( BSPTreePoly::Vertex* new_vtx,
                                        BSPTreePoly::Edge* into_edge );
@@ -455,7 +455,7 @@
     } while (edge && edge != face->usePtr);
   }
 }
-
+/*
 static void merge_edges( BSPTreePoly::Edge* keep_edge,
                          BSPTreePoly::Edge* dead_edge )
 {
@@ -479,7 +479,7 @@
   // (including removing dead edge from face loops)
   delete dead_edge;
 }
-
+*/
 static BSPTreePoly::Edge* split_edge( BSPTreePoly::Vertex* new_vtx,
                                        BSPTreePoly::Edge* into_edge )
 {

Modified: MOAB/trunk/ReadIDEAS.cpp
===================================================================
--- MOAB/trunk/ReadIDEAS.cpp	2009-12-16 19:45:23 UTC (rev 3416)
+++ MOAB/trunk/ReadIDEAS.cpp	2009-12-16 19:50:46 UTC (rev 3417)
@@ -65,7 +65,6 @@
     file.getline(line, 10000);
     s = line;
 
-    MBErrorCode rval;
     unsigned int header_id = (unsigned int) strtol(line, NULL, 10);
     switch (header_id) {
       case VERTEX_LIST :

Modified: MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp
===================================================================
--- MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp	2009-12-16 19:45:23 UTC (rev 3416)
+++ MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp	2009-12-16 19:50:46 UTC (rev 3417)
@@ -320,7 +320,8 @@
   
     const MBEntityHandle* file_set = 0;
     if (handle != 0 /*root_set*/) {
-      file_set = reinterpret_cast<const MBEntityHandle*>(&handle);
+      const iBase_EntitySetHandle* ptr = &handle;
+      file_set = reinterpret_cast<const MBEntityHandle*>(ptr);
     }
   
     result = MBI->load_file(tmp_filename.c_str(), file_set, opts.c_str());