summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2018-06-24 08:57:30 (GMT)
committerGitHub <noreply@github.com>2018-06-24 08:57:30 (GMT)
commit56c60e84e6dd6d7e4e7774be24d1402782fd3230 (patch)
tree4341e26d4bf860fec4c5784b042a5c9130ae2da4 /testing
parentba30b13cfd4910a5913f080a039fc429ec8a7e3f (diff)
parent154e877cc2e8b10091d7e0068b6f6d5793cd29f3 (diff)
downloadDoxygen-56c60e84e6dd6d7e4e7774be24d1402782fd3230.zip
Doxygen-56c60e84e6dd6d7e4e7774be24d1402782fd3230.tar.gz
Doxygen-56c60e84e6dd6d7e4e7774be24d1402782fd3230.tar.bz2
Merge branch 'master' into feature/bug_tableofcontents_latex
Diffstat (limited to 'testing')
-rw-r--r--testing/015/015__cond_8c.xml4
-rw-r--r--testing/015_cond.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/testing/015/015__cond_8c.xml b/testing/015/015__cond_8c.xml
index 43cf335..bcc18b5 100644
--- a/testing/015/015__cond_8c.xml
+++ b/testing/015/015__cond_8c.xml
@@ -11,15 +11,17 @@
<briefdescription>
</briefdescription>
<detaileddescription>
+ <para>Function to be shown. </para>
</detaileddescription>
<inbodydescription>
</inbodydescription>
- <location file="015_cond.c" line="20" column="1" bodyfile="015_cond.c" bodystart="20" bodyend="22"/>
+ <location file="015_cond.c" line="21" column="1" bodyfile="015_cond.c" bodystart="21" bodyend="23"/>
</memberdef>
</sectiondef>
<briefdescription>
</briefdescription>
<detaileddescription>
+ <para>Text <emphasis>argument</emphasis> more text. </para>
</detaileddescription>
<location file="015_cond.c"/>
</compounddef>
diff --git a/testing/015_cond.c b/testing/015_cond.c
index ab3044c..0ac209d 100644
--- a/testing/015_cond.c
+++ b/testing/015_cond.c
@@ -1,4 +1,4 @@
-// objective: test the \cond command
+// objective: test the `cond` command
// check: 015__cond_8c.xml
// config: ENABLED_SECTIONS = COND_ENABLED
@@ -17,12 +17,14 @@ void func();
/// \endcond
/// \cond COND_ENABLED
+/// Function to be shown.
void cond_enabled()
{
}
/// \endcond
/** \cond COND_DISABLED */
+ Function not to be shown.
void cond_disabled()
{
}