diff options
| author | Georg Brandl <georg@python.org> | 2011-09-22 10:23:54 +0200 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2011-09-22 10:23:54 +0200 |
| commit | ccef6db7cb04db18258c41a4fd5af6384525737a (patch) | |
| tree | a13ac09da8f424b886574598f71b2db8b45ebde5 | |
| parent | 94192b1edf7b2e0306d8e5905d5e980a7c062153 (diff) | |
| download | sphinx-ccef6db7cb04db18258c41a4fd5af6384525737a.tar.gz | |
Fix #677: allow multiple signatures in C++ domain directives.
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | sphinx/domains/cpp.py | 2 | ||||
| -rw-r--r-- | tests/root/objects.txt | 4 |
3 files changed, 4 insertions, 4 deletions
@@ -1,6 +1,8 @@ Release 1.0.8 (in development) ============================== +* #677: Fix parsing of multiple signatures in C++ domain. + * #637: Ignore Emacs lock files when looking for source files. * #544: Allow .pyw extension for importable modules in autodoc. diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py index f07037e4..dac0106b 100644 --- a/sphinx/domains/cpp.py +++ b/sphinx/domains/cpp.py @@ -122,7 +122,7 @@ class DefExpr(object): return False try: for key, value in self.__dict__.iteritems(): - if value != getattr(other, value): + if value != getattr(other, key): return False except AttributeError: return False diff --git a/tests/root/objects.txt b/tests/root/objects.txt index 51ecee91..533bdae3 100644 --- a/tests/root/objects.txt +++ b/tests/root/objects.txt @@ -169,6 +169,4 @@ CPP domain .. cpp:class:: n::Array<T,d> .. cpp:function:: T& operator[]( unsigned j ) - - .. cpp:function:: const T& operator[]( unsigned j ) const - + const T& operator[]( unsigned j ) const |