mirror of
https://github.com/sphinx-doc/sphinx.git
synced 2025-02-25 18:55:22 -06:00
Fix tracebacks occurring for duplicate C++ domain objects.
This commit is contained in:
parent
c873409943
commit
81ecbc19b0
2
CHANGES
2
CHANGES
@ -1,6 +1,8 @@
|
||||
Release 1.0.7 (in development)
|
||||
==============================
|
||||
|
||||
* Fix tracebacks occurring for duplicate C++ domain objects.
|
||||
|
||||
|
||||
Release 1.0.6 (Jan 04, 2011)
|
||||
============================
|
||||
|
@ -161,7 +161,7 @@ class DefExpr(object):
|
||||
return unicode(self).encode('utf-8')
|
||||
|
||||
def __repr__(self):
|
||||
return '<defexpr %s>' % self
|
||||
return '<%s %s>' % (self.__class__.__name__, self)
|
||||
|
||||
|
||||
class PrimaryDefExpr(DefExpr):
|
||||
@ -818,6 +818,7 @@ class CPPObject(ObjectDescription):
|
||||
def add_target_and_index(self, sigobj, sig, signode):
|
||||
theid = sigobj.get_id()
|
||||
name = unicode(sigobj.name)
|
||||
if theid not in self.state.document.ids:
|
||||
signode['names'].append(theid)
|
||||
signode['ids'].append(theid)
|
||||
signode['first'] = (not self.names)
|
||||
|
@ -161,3 +161,14 @@ User markup
|
||||
|
||||
|
||||
Referencing :userdescrole:`myobj`.
|
||||
|
||||
|
||||
CPP domain
|
||||
==========
|
||||
|
||||
.. cpp:class:: n::Array<T,d>
|
||||
|
||||
.. cpp:function:: T& operator[]( unsigned j )
|
||||
|
||||
.. cpp:function:: const T& operator[]( unsigned j ) const
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user