summaryrefslogtreecommitdiffstats
path: root/tools/clang/plugins
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-15 19:00:30 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-15 19:00:30 +0000
commit241109b52c26585ba262e95f7f07fda23307cc27 (patch)
treed9864bdf4b32568849f8fbef978936b1ab4bf47a /tools/clang/plugins
parent0822d88ca6c5451ab3553cca1a603ebfc575dc40 (diff)
downloadchromium_src-241109b52c26585ba262e95f7f07fda23307cc27.zip
chromium_src-241109b52c26585ba262e95f7f07fda23307cc27.tar.gz
chromium_src-241109b52c26585ba262e95f7f07fda23307cc27.tar.bz2
roll clang 140930:142072
Also add a --run-tests parameter to update.sh The plugin change is required due to http://lists.cs.uiuc.edu/pipermail/cfe-commits/Week-of-Mon-20111010/047769.html BUG=none TEST=none TBR=hans Review URL: http://codereview.chromium.org/8247005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105679 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/clang/plugins')
-rw-r--r--tools/clang/plugins/ChromeClassTester.cpp2
-rw-r--r--tools/clang/plugins/tests/virtual_methods.h13
2 files changed, 14 insertions, 1 deletions
diff --git a/tools/clang/plugins/ChromeClassTester.cpp b/tools/clang/plugins/ChromeClassTester.cpp
index 3bcbf58..f7b9e02 100644
--- a/tools/clang/plugins/ChromeClassTester.cpp
+++ b/tools/clang/plugins/ChromeClassTester.cpp
@@ -177,7 +177,7 @@ std::string ChromeClassTester::GetNamespaceImpl(const DeclContext* context,
if (decl->isAnonymousNamespace())
OS << "<anonymous namespace>";
else
- OS << decl;
+ OS << *decl;
return GetNamespaceImpl(context->getParent(),
OS.str());
}
diff --git a/tools/clang/plugins/tests/virtual_methods.h b/tools/clang/plugins/tests/virtual_methods.h
index cb1846e..d256f07 100644
--- a/tools/clang/plugins/tests/virtual_methods.h
+++ b/tools/clang/plugins/tests/virtual_methods.h
@@ -23,4 +23,17 @@ class WarnOnMissingVirtual : public VirtualMethodsInHeaders {
void MethodHasNoArguments();
};
+// Don't complain about things in a 'testing' namespace.
+namespace testing {
+struct TestStruct {};
+} // namespace testing
+
+class VirtualMethodsInHeadersTesting : public VirtualMethodsInHeaders {
+ public:
+ // Don't complain about no virtual testing methods.
+ void MethodHasNoArguments();
+ private:
+ testing::TestStruct tester_;
+};
+
#endif // VIRTUAL_METHODS_H_