diff options
| author | Georg Brandl <georg@python.org> | 2012-01-29 10:05:29 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2012-01-29 10:05:29 +0100 |
| commit | 20245f576d3c17d1ee67648a0458d042c5d4c554 (patch) | |
| tree | 9cdb2ea23e83bd3249062a81a61cce10c9f618de /sphinx/domains/cpp.py | |
| parent | 02ab7ce9a3d373a07fab23cbb4c4ddc4934d93d0 (diff) | |
| parent | fc628724e4f9cff329b5c035d00f1b8af5f68ec0 (diff) | |
| download | sphinx-20245f576d3c17d1ee67648a0458d042c5d4c554.tar.gz | |
Merged in matm/sphinx (pull request #39)
Diffstat (limited to 'sphinx/domains/cpp.py')
| -rw-r--r-- | sphinx/domains/cpp.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py index 319ded44..a6392c1c 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 = { |