From 98722ed55c7e05e2ac766d38a076fdcfded11b77 Mon Sep 17 00:00:00 2001 From: bangerth Date: Thu, 21 Oct 2010 16:04:27 +0000 Subject: [PATCH] Make things compile and link. git-svn-id: https://svn.dealii.org/trunk@22424 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/base/include/base/parameter_handler.h | 58 +++++++++---------- deal.II/base/source/parameter_handler.cc | 16 +++++ 2 files changed, 42 insertions(+), 32 deletions(-) diff --git a/deal.II/base/include/base/parameter_handler.h b/deal.II/base/include/base/parameter_handler.h index 05864f1e4e..cd7e389c31 100644 --- a/deal.II/base/include/base/parameter_handler.h +++ b/deal.II/base/include/base/parameter_handler.h @@ -276,13 +276,12 @@ namespace Patterns * a valid range. */ const int upper_bound; - - /** - * Initial part of description - */ - static const char* description_init; + + /** + * Initial part of description + */ + static const char* description_init; }; - const char* Integer::description_init = "[Integer"; /** * Test for the string being a @@ -416,13 +415,12 @@ namespace Patterns * a valid range. */ const double upper_bound; - - /** - * Initial part of description - */ - static const char* description_init; + + /** + * Initial part of description + */ + static const char* description_init; }; - const char* Double::description_init = "[Double"; /** * Test for the string being one @@ -496,12 +494,11 @@ namespace Patterns */ std::string sequence; - /** - * Initial part of description - */ - static const char* description_init; + /** + * Initial part of description + */ + static const char* description_init; }; - const char* Selection::description_init = "[Selection"; /** @@ -615,12 +612,11 @@ namespace Patterns */ const unsigned int max_elements; - /** - * Initial part of description - */ - static const char* description_init; + /** + * Initial part of description + */ + static const char* description_init; }; - const char* List::description_init = "[List"; /** * This class is much like the @@ -713,12 +709,11 @@ namespace Patterns */ std::string sequence; - /** - * Initial part of description - */ - static const char* description_init; + /** + * Initial part of description + */ + static const char* description_init; }; - const char* MultipleSelection::description_init = "[MultipleSelection"; /** * Test for the string being @@ -789,12 +784,11 @@ namespace Patterns */ virtual PatternBase * clone () const; - /** - * Initial part of description - */ - static const char* description_init; + /** + * Initial part of description + */ + static const char* description_init; }; - const char* Anything::description_init = "[Anything"; } diff --git a/deal.II/base/source/parameter_handler.cc b/deal.II/base/source/parameter_handler.cc index 3b7b22944c..b5c817a4c9 100644 --- a/deal.II/base/source/parameter_handler.cc +++ b/deal.II/base/source/parameter_handler.cc @@ -107,6 +107,8 @@ namespace Patterns #endif + const char* Integer::description_init = "[Integer"; + Integer::Integer (const int lower_bound, const int upper_bound) : @@ -183,6 +185,8 @@ namespace Patterns 0; #endif + const char* Double::description_init = "[Double"; + Double::Double (const double lower_bound, const double upper_bound) : @@ -248,6 +252,9 @@ namespace Patterns + const char* Selection::description_init = "[Selection"; + + Selection::Selection (const std::string &seq) { sequence = seq; @@ -320,6 +327,9 @@ namespace Patterns #endif + const char* List::description_init = "[List"; + + List::List (const PatternBase &p, const unsigned int min_elements, const unsigned int max_elements) @@ -419,6 +429,9 @@ namespace Patterns + const char* MultipleSelection::description_init = "[MultipleSelection"; + + MultipleSelection::MultipleSelection (const std::string &seq) { Assert (seq.find (",") == std::string::npos, ExcCommasNotAllowed(seq.find(","))); @@ -541,6 +554,9 @@ namespace Patterns + const char* Anything::description_init = "[Anything"; + + Anything::Anything () {} -- 2.39.5