[MOAB-dev] r3093 - MOAB/trunk

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2009-08-04 09:30:45 -0500 (Tue, 04 Aug 2009)
New Revision: 3093

Modified:
   MOAB/trunk/MBCN.cpp
   MOAB/trunk/MBSkinner.cpp
   MOAB/trunk/MeshTopoUtil.cpp
   MOAB/trunk/Tqdcfr.cpp
Log:
remove unnecessary 'static' for a few local variables

Modified: MOAB/trunk/MBCN.cpp
===================================================================
--- MOAB/trunk/MBCN.cpp	2009-08-03 22:44:09 UTC (rev 3092)
+++ MOAB/trunk/MBCN.cpp	2009-08-04 14:30:45 UTC (rev 3093)
@@ -969,7 +969,7 @@
                         const int indices_per_ent,
                         const int num_entries) 
 {
-  static T tmp_conn[MB_MAX_SUB_ENTITIES];
+  T tmp_conn[MB_MAX_SUB_ENTITIES];
   assert(indices_per_ent <= MBCN::permuteVec[t][dim][MB_MAX_SUB_ENTITIES]);
   if (indices_per_ent > MBCN::permuteVec[t][dim][MB_MAX_SUB_ENTITIES]) return 1;
   short int *tvec = MBCN::permuteVec[t][dim];
@@ -991,7 +991,7 @@
                             const int indices_per_ent,
                             const int num_entries) 
 {
-  static T tmp_conn[MB_MAX_SUB_ENTITIES];
+  T tmp_conn[MB_MAX_SUB_ENTITIES];
   assert(indices_per_ent <= MBCN::revPermuteVec[t][dim][MB_MAX_SUB_ENTITIES]);
   if (indices_per_ent > MBCN::revPermuteVec[t][dim][MB_MAX_SUB_ENTITIES]) return 1;
   short int *tvec = MBCN::revPermuteVec[t][dim];

Modified: MOAB/trunk/MBSkinner.cpp
===================================================================
--- MOAB/trunk/MBSkinner.cpp	2009-08-03 22:44:09 UTC (rev 3092)
+++ MOAB/trunk/MBSkinner.cpp	2009-08-04 14:30:45 UTC (rev 3093)
@@ -645,7 +645,7 @@
   end_iter = boundary.end();
 
   std::vector<MBEntityHandle> conn;
-  static MBEntityHandle sub_conn[2];
+  MBEntityHandle sub_conn[2];
   MBEntityHandle match;
 
   MBRange edge_list;

Modified: MOAB/trunk/MeshTopoUtil.cpp
===================================================================
--- MOAB/trunk/MeshTopoUtil.cpp	2009-08-03 22:44:09 UTC (rev 3092)
+++ MOAB/trunk/MeshTopoUtil.cpp	2009-08-04 14:30:45 UTC (rev 3093)
@@ -466,7 +466,7 @@
 
   if (bridge_dim < from_dim) {
       // looping over each sub-entity of dimension bridge_dim...
-    static MBEntityHandle bridge_verts[MB_MAX_SUB_ENTITIES];
+    MBEntityHandle bridge_verts[MB_MAX_SUB_ENTITIES];
     int bridge_indices[MB_MAX_SUB_ENTITIES];
     for (int i = 0; i < MBCN::NumSubEntities(from_type, bridge_dim); i++) {
 

Modified: MOAB/trunk/Tqdcfr.cpp
===================================================================
--- MOAB/trunk/Tqdcfr.cpp	2009-08-03 22:44:09 UTC (rev 3092)
+++ MOAB/trunk/Tqdcfr.cpp	2009-08-04 14:30:45 UTC (rev 3093)
@@ -2262,8 +2262,7 @@
 MBErrorCode Tqdcfr::reset_record(AcisRecord &this_record) 
 {
   this_record.rec_type = Tqdcfr::UNKNOWN;
-  static const std::string blank;
-  this_record.att_string = blank;
+  this_record.att_string.clear();
   this_record.first_attrib = this_record.att_prev = 
     this_record.att_next = this_record.att_ent_num = -1;
   this_record.processed = false;