diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index eecff1d9c..d8c65d680 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -110,6 +110,20 @@ class DefExpr(object):
     def __unicode__(self):
         raise NotImplementedError()
 
+    def __eq__(self, other):
+        if type(self) is not type(other):
+            return False
+        try:
+            for key, value in self.__dict__.iteritems():
+                if value != getattr(other, value):
+                    return False
+        except AttributeError:
+            return False
+        return True
+
+    def __ne__(self, other):
+        return not self.__eq__(other)
+
     def clone(self):
         """Close a definition expression node"""
         return deepcopy(self)
diff --git a/tests/test_cpp_domain.py b/tests/test_cpp_domain.py
new file mode 100644
index 000000000..48de51c1e
--- /dev/null
+++ b/tests/test_cpp_domain.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+"""
+    test_cpp_domain
+    ~~~~~~~~~~~~~~~
+
+    Tests the C++ Domain
+
+    :copyright: Copyright 2007-2010 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from util import *
+
+from sphinx.domains.cpp import DefinitionParser
+
+
+def parse(name, string):
+    return getattr(DefinitionParser(string), 'parse_' + name)()
+
+
+def test_type_definitions():
+    """Tests the type definition parsing"""
+    rv = parse('member_object', '  const  std::string  &  name = 42')
+    assert unicode(rv) == 'const std::string& name = 42'
+
+    rv = parse('member_object', '  const  std::string  &  name leftover')
+    assert unicode(rv) == 'const std::string& name'
+
+    rv = parse('member_object', 'const std::vector< unsigned int, long> &name')
+    assert unicode(rv) == 'const std::vector<unsigned int, long>& name'
+
+    x = 'std::vector<std::pair<std::string, int>>& module::test(register ' \
+        'foo, bar, std::string baz="foobar, blah, bleh") const = 0'
+    assert unicode(parse('function', x)) == x
+
+    x = 'module::myclass::operator std::vector<std::string>()'
+    assert unicode(parse('function', x)) == x
+
+    x = 'std::vector<std::pair<std::string, long long>> module::blah'
+    assert unicode(parse('type_object', x)) == x
+
+    assert unicode(parse('type_object', 'long long int foo')) == 'long long foo'