diff options
| author | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2012-10-17 12:31:00 +0200 |
|---|---|---|
| committer | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2012-10-17 12:31:00 +0200 |
| commit | fe2e3e864f4e9e0041ed47495932be2da929808d (patch) | |
| tree | 446066bbdbd74c848e3ee8a88594f01bbbf60bc5 | |
| parent | 94300f899dc5d295c5027d6c9d1c732846a06b1c (diff) | |
| download | sigc++-libsigc-2-2.tar.gz | |
Add a missing newin{}.libsigc-2-2
* docs/reference/Doxyfile.in: Add ALIASES newin.
* sigc++/functors/macros/functor_trait.h.m4: Add newin{2,2,11} to
SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | docs/reference/Doxyfile.in | 5 | ||||
| -rw-r--r-- | sigc++/functors/macros/functor_trait.h.m4 | 2 |
3 files changed, 13 insertions, 2 deletions
@@ -1,3 +1,11 @@ +2012-10-17 Kjell Ahlstedt <kjell.ahlstedt@bredband.net> + + Add a missing newin{}. + + * docs/reference/Doxyfile.in: Add ALIASES newin. + * sigc++/functors/macros/functor_trait.h.m4: Add newin{2,2,11} to + SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE. + 2.2.11: 2012-09-20 Andris Pavenis <andris.pavenis@iki.fi> diff --git a/docs/reference/Doxyfile.in b/docs/reference/Doxyfile.in index d320cd3..c71acf7 100644 --- a/docs/reference/Doxyfile.in +++ b/docs/reference/Doxyfile.in @@ -27,7 +27,8 @@ MULTILINE_CPP_IS_BRIEF = NO INHERIT_DOCS = YES SEPARATE_MEMBER_PAGES = NO TAB_SIZE = 8 -ALIASES = +ALIASES = "newin{2}=\xrefitem since_\1_\2 \"Since @PACKAGE_NAME@ \1.\2\" \"New API in @PACKAGE_NAME@ \1.\2\"" +ALIASES += "newin{3}=\xrefitem since_\1_\2_\3 \"Since @PACKAGE_NAME@ \1.\2.\3\" \"New API in @PACKAGE_NAME@ \1.\2.\3\"" OPTIMIZE_OUTPUT_FOR_C = NO OPTIMIZE_OUTPUT_JAVA = NO OPTIMIZE_FOR_FORTRAN = NO @@ -161,7 +162,7 @@ QHP_SECT_FILTER_ATTRS = QHG_LOCATION = DISABLE_INDEX = NO ENUM_VALUES_PER_LINE = 1 -GENERATE_TREEVIEW = NONE +GENERATE_TREEVIEW = NO USE_INLINE_TREES = NO TREEVIEW_WIDTH = 250 FORMULA_FONTSIZE = 10 diff --git a/sigc++/functors/macros/functor_trait.h.m4 b/sigc++/functors/macros/functor_trait.h.m4 index 4e1afb7..fcbc765 100644 --- a/sigc++/functors/macros/functor_trait.h.m4 +++ b/sigc++/functors/macros/functor_trait.h.m4 @@ -193,6 +193,8 @@ struct functor_trait<T_functor,false> \ * } * @endcode * + * @newin{2,2,11} + * * You can't use both SIGC_FUNCTORS_HAVE_RESULT_TYPE and * SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE in the same compilation unit. * |