summaryrefslogtreecommitdiff
path: root/tests/test_domain_cpp.py
diff options
context:
space:
mode:
authorjfbu <jfbu@free.fr>2017-05-11 11:40:06 +0200
committerjfbu <jfbu@free.fr>2017-05-11 11:45:14 +0200
commite277cb72852dd2c9cbc44a79423d5b0297a03785 (patch)
tree172db93f7f1d7f85f3f3dfe16e32eedf822915b6 /tests/test_domain_cpp.py
parent17d5669686b813892e4114a86536f8c8fd2ec429 (diff)
parentd7d7a1cff95cff2f54f6c06a92eb45a05bf758a3 (diff)
downloadsphinx-git-e277cb72852dd2c9cbc44a79423d5b0297a03785.tar.gz
Merge branch '1.6-release'
Fixed conflicts: tests/test_build_html5.py Also updated tests/test_build_latex.py
Diffstat (limited to 'tests/test_domain_cpp.py')
-rw-r--r--tests/test_domain_cpp.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/test_domain_cpp.py b/tests/test_domain_cpp.py
index 7c471d61e..8fa5405bc 100644
--- a/tests/test_domain_cpp.py
+++ b/tests/test_domain_cpp.py
@@ -537,6 +537,7 @@ def test_templates():
{2:'IDpE8Numerics'})
+
def test_template_args():
# from breathe#218
check('function',
@@ -550,6 +551,7 @@ def test_template_args():
{2:"I0E21enable_if_not_array_t"})
+
def test_attributes():
# style: C++
check('member', '[[]] int f', {1:'f__i', 2:'1f'})