From: bangerth Date: Tue, 30 Apr 2013 16:48:34 +0000 (+0000) Subject: Rename variable in inner scope to avoid clash with outer scope. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d27f5de79e3078cdcc07bada3c306bb7272cf97;p=dealii-svn.git Rename variable in inner scope to avoid clash with outer scope. git-svn-id: https://svn.dealii.org/trunk@29414 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/source/base/table_handler.cc b/deal.II/source/base/table_handler.cc index 2395c347f4..d9b500718c 100644 --- a/deal.II/source/base/table_handler.cc +++ b/deal.II/source/base/table_handler.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, 2011, 2012 by the deal.II authors +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, 2011, 2012, 2013 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -669,9 +669,9 @@ void TableHandler::get_selected_columns(std::vector &sel_columns) c { // i.e. key is a supercolumn key const unsigned int n_subcolumns=super_iter->second.size(); - for (unsigned int j=0; jsecond[j]; + const std::string subkey=super_iter->second[k]; Assert(columns.count(subkey), ExcInternalError()); sel_columns.push_back(subkey); }