diff --git a/CHANGES b/CHANGES index 6979c9d1f5..e08c5f4479 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +2.3-137 | 2014-09-08 19:01:13 -0500 + + * Fix Broxygen's rendering of opaque types. (Jon Siwek) + 2.3-136 | 2014-09-07 20:50:46 -0700 * Change more http links to https. (Johanna Amann) diff --git a/VERSION b/VERSION index 8671300356..5cdbf3ec5a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.3-136 +2.3-137 diff --git a/src/Type.cc b/src/Type.cc index f941041414..ead31f1b7d 100644 --- a/src/Type.cc +++ b/src/Type.cc @@ -1381,6 +1381,11 @@ void OpaqueType::Describe(ODesc* d) const d->Add(name.c_str()); } +void OpaqueType::DescribeReST(ODesc* d, bool roles_only) const + { + d->Add(fmt(":bro:type:`%s` of %s", type_name(Tag()), name.c_str())); + } + IMPLEMENT_SERIAL(OpaqueType, SER_OPAQUE_TYPE); bool OpaqueType::DoSerialize(SerialInfo* info) const diff --git a/src/Type.h b/src/Type.h index a4c9bda541..a9f1e42a6d 100644 --- a/src/Type.h +++ b/src/Type.h @@ -534,6 +534,7 @@ public: const string& Name() const { return name; } void Describe(ODesc* d) const; + void DescribeReST(ODesc* d, bool roles_only = false) const; protected: OpaqueType() { }