From: Wolfgang Bangerth Date: Wed, 15 Jan 2014 16:34:36 +0000 (+0000) Subject: Also import the DataOutBase::Patch name into DataOutInterface to make MS VC X-Git-Tag: v8.2.0-rc1~1031 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d3a186bd59707fb864aa718fa881e1b46912218;p=dealii.git Also import the DataOutBase::Patch name into DataOutInterface to make MS VC happy. Fix a couple of minor editorial warts. git-svn-id: https://svn.dealii.org/trunk@32217 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/base/data_out_base.h b/deal.II/include/deal.II/base/data_out_base.h index db413f05fd..0d9ee2bbf3 100644 --- a/deal.II/include/deal.II/base/data_out_base.h +++ b/deal.II/include/deal.II/base/data_out_base.h @@ -1,7 +1,7 @@ // --------------------------------------------------------------------- // $Id$ // -// Copyright (C) 1999 - 2013 by the deal.II authors +// Copyright (C) 1999 - 2014 by the deal.II authors // // This file is part of the deal.II library. // @@ -1087,11 +1087,8 @@ public: * of an STL std::map type with a certain number of * elements?), this is only an estimate. however often quite close * to the true value. - */ + */ std::size_t memory_consumption () const; - - private: - }; @@ -1111,6 +1108,7 @@ public: * understand. */ static const unsigned int format_version = 3; + private: /** * Dummy entry to suppress compiler warnings when copying an empty @@ -2308,6 +2306,8 @@ public: using DataOutBase::get_output_format_names; using DataOutBase::determine_intermediate_format_dimensions; + using DataOutBase::Patch; + /** * Constructor. */