summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Ronacher <armin.ronacher@active-4.com>2012-01-25 13:41:11 +0100
committerArmin Ronacher <armin.ronacher@active-4.com>2012-01-25 13:41:11 +0100
commite03c0abbe990fa829ca4adab97b0fd246c449e71 (patch)
treeab2f632b39f1300a608b6db6312535e609efbfbe
parentd6c77483e0040c4baf9afd7df758a2c95e028431 (diff)
downloadsphinx-e03c0abbe990fa829ca4adab97b0fd246c449e71.tar.gz
Fixed a priority error that caused operator++ and operator-> to not be parsed properly in the C++ domain. This fixes #861
-rw-r--r--sphinx/domains/cpp.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index 319ded44..971aa178 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -34,10 +34,10 @@ _template_arg_re = re.compile(r'(%s)|([^,>]+)' % _string_re.pattern, re.S)
_operator_re = re.compile(r'''(?x)
\[\s*\]
| \(\s*\)
- | [!<>=/*%+|&^-]=?
| \+\+ | --
- | (<<|>>)=? | ~ | && | \| | \|\|
| ->\*? | \,
+ | [!<>=/*%+|&^-]=?
+ | (<<|>>)=? | ~ | && | \| | \|\|
''')
_id_shortwords = {