[cig-commits] r22064 - short/3D/PyLith/trunk/libsrc/pylith/topology

brad at geodynamics.org brad at geodynamics.org
Tue May 14 15:30:41 PDT 2013


Author: brad
Date: 2013-05-14 15:30:41 -0700 (Tue, 14 May 2013)
New Revision: 22064

Modified:
   short/3D/PyLith/trunk/libsrc/pylith/topology/Field.cc
Log:
Remove typename (no longer a template).

Modified: short/3D/PyLith/trunk/libsrc/pylith/topology/Field.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/topology/Field.cc	2013-05-14 20:25:37 UTC (rev 22063)
+++ short/3D/PyLith/trunk/libsrc/pylith/topology/Field.cc	2013-05-14 22:30:41 UTC (rev 22064)
@@ -163,8 +163,8 @@
   if (_localVec)  {err = PetscObjectSetName((PetscObject) _localVec, value);PYLITH_CHECK_ERROR(err);}
   if (_globalVec) {err = PetscObjectSetName((PetscObject) _globalVec, value);PYLITH_CHECK_ERROR(err);}
 
-  const typename scatter_map_type::const_iterator scattersEnd = _scatters.end();
-  for (typename scatter_map_type::const_iterator s_iter=_scatters.begin();
+  const scatter_map_type::const_iterator scattersEnd = _scatters.end();
+  for (scatter_map_type::const_iterator s_iter=_scatters.begin();
        s_iter != scattersEnd;
        ++s_iter) {
     if (s_iter->second.vector) {
@@ -458,8 +458,8 @@
     
   // Reuse scatters in clone
   if (src._scatters.size() > 0) {
-    const typename scatter_map_type::const_iterator scattersEnd = src._scatters.end();
-    for (typename scatter_map_type::const_iterator s_iter=src._scatters.begin();
+    const scatter_map_type::const_iterator scattersEnd = src._scatters.end();
+    for (scatter_map_type::const_iterator s_iter=src._scatters.begin();
          s_iter != scattersEnd;
          ++s_iter) {
       ScatterInfo sinfo;
@@ -519,8 +519,8 @@
 
   PetscErrorCode err = 0;
   
-  const typename scatter_map_type::const_iterator scattersEnd = _scatters.end();
-  for (typename scatter_map_type::iterator s_iter=_scatters.begin();
+  const scatter_map_type::const_iterator scattersEnd = _scatters.end();
+  for (scatter_map_type::iterator s_iter=_scatters.begin();
        s_iter != scattersEnd;
        ++s_iter) {
 
@@ -1295,7 +1295,7 @@
 
   assert(context);
 
-  const typename scatter_map_type::const_iterator s_iter = 
+  const scatter_map_type::const_iterator s_iter = 
     _scatters.find(context);
   if (s_iter == _scatters.end()) {
     std::ostringstream msg;



More information about the CIG-COMMITS mailing list