diff --git a/doc/handbook/0_listingstyle.tex b/doc/handbook/0_listingstyle.tex index 205b320e195b04d7430e23ee00cc3c28d0612723..f4b36a051af53f3dd82f7b1aea21cd1d36f42b51 100644 --- a/doc/handbook/0_listingstyle.tex +++ b/doc/handbook/0_listingstyle.tex @@ -87,11 +87,6 @@ keywordstyle=\color{dumuxBlue}\ttfamily\let\textcolor\textcolordummy, stringstyle=\color{BrickRed}\ttfamily\let\textcolor\textcolordummy, commentstyle=\color[gray]{0.35}\ttfamily\itshape\let\textcolor\textcolordummy, - emph={NEW_TYPE_TAG, NEW_PROP_TAG, UNSET_PROP, TTAG, PTAG, - SET_PROP, GET_PROP, GET_PROP_VALUE, GET_PROP_TYPE, - SET_BOOL_PROP, SET_STRING_PROP, SET_SCALAR_PROP, SET_TYPE_PROP, SET_INT_PROP, - GET_BOOL_PROP, GET_STRING_PROP, GET_SCALAR_PROP, GET_TYPE_PROP, GET_INT_PROP, - GET_PARAM, GET_PARAM_FROM_GROUP, GET_RUNTIME_PARAM, GET_RUNTIME_PARAM_FROM_GROUP}, emphstyle=\color{OliveGreen}\let\textcolor\textcolordummy, directivestyle=\color{Brown}\ttfamily\let\textcolor\textcolordummy, } diff --git a/test/common/propertysystem/test_propertysystem.cc b/test/common/propertysystem/test_propertysystem.cc index efd222777ffad67f569702b44c3852afe110bfe3..e173328427e9e43e6d8f6bc7689748bcadd66e1f 100644 --- a/test/common/propertysystem/test_propertysystem.cc +++ b/test/common/propertysystem/test_propertysystem.cc @@ -34,10 +34,10 @@ namespace Dumux { namespace Properties { -// create some Properties (equivalent to old macro NEW_PROP_TAG(...)) +// create some properties: // the first type tag is the actual TypeTag for which the property will be obtained // (can be used to make properties depend on other properties), -// the second type tag is for parital specialization (equivalent to old macro SET_PROP(...), see below) +// the second type tag is for partial specialization // the default property should be always undefined to produce a good error message // if the user attempt to get an unset property template<class TypeTag, class MyTypeTag> @@ -50,7 +50,7 @@ template<class TypeTag, class MyTypeTag> struct UseTpfaFlux { using type = UndefinedProperty; }; namespace TTag { -// create some TypeTags (equivalent to old macro NEW_TYPE_TAG(..., INHERITS_FROM(...))) +// create some type tags: // the tuple is sorted by precedence, the first one overwriting the following struct Base { }; struct Grid { }; @@ -61,7 +61,7 @@ struct OnePTest { using InheritsFrom = std::tuple<OnePModel, BoxDisc>; }; } // end namespace TTag -// set and overwrite some properties (equivalent to old macro SET_PROP(...){};) +// set and overwrite some properties template<class TypeTag> struct Scalar<TypeTag, TTag::Base> { using type = float; };