summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--clang-tools-extra/docs/clang-tidy/checks/misc-definitions-in-headers.rst2
-rwxr-xr-xclang-tools-extra/test/clang-tidy/check_clang_tidy.py4
-rw-r--r--clang-tools-extra/test/clang-tidy/misc-definitions-in-headers.hpp4
3 files changed, 7 insertions, 3 deletions
diff --git a/clang-tools-extra/docs/clang-tidy/checks/misc-definitions-in-headers.rst b/clang-tools-extra/docs/clang-tidy/checks/misc-definitions-in-headers.rst
index d912004f252..96a3b1b5b23 100644
--- a/clang-tools-extra/docs/clang-tidy/checks/misc-definitions-in-headers.rst
+++ b/clang-tools-extra/docs/clang-tidy/checks/misc-definitions-in-headers.rst
@@ -82,6 +82,8 @@ from multiple translation units.
constexpr int k = 1; // OK: constexpr variable has internal linkage.
+ constexpr int f10() { return 0; } // OK: constexpr function definition.
+
Options
-------
diff --git a/clang-tools-extra/test/clang-tidy/check_clang_tidy.py b/clang-tools-extra/test/clang-tidy/check_clang_tidy.py
index c950042ff0b..114f0d55946 100755
--- a/clang-tools-extra/test/clang-tidy/check_clang_tidy.py
+++ b/clang-tools-extra/test/clang-tidy/check_clang_tidy.py
@@ -58,8 +58,8 @@ def main():
clang_tidy_extra_args = extra_args
if len(clang_tidy_extra_args) == 0:
- clang_tidy_extra_args = ['--', '--std=c++11'] if extension == '.cpp' \
- else ['--']
+ clang_tidy_extra_args = ['--', '--std=c++11'] \
+ if extension == '.cpp' or extension == '.hpp' else ['--']
# Tests should not rely on STL being available, and instead provide mock
# implementations of relevant APIs.
diff --git a/clang-tools-extra/test/clang-tidy/misc-definitions-in-headers.hpp b/clang-tools-extra/test/clang-tidy/misc-definitions-in-headers.hpp
index 42fd155cdd0..5e83e68e846 100644
--- a/clang-tools-extra/test/clang-tidy/misc-definitions-in-headers.hpp
+++ b/clang-tools-extra/test/clang-tidy/misc-definitions-in-headers.hpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s misc-definitions-in-headers %t -- -- -std=c++11
+// RUN: %check_clang_tidy %s misc-definitions-in-headers %t
int f() {
// CHECK-MESSAGES: :[[@LINE-1]]:5: warning: function 'f' defined in a header file; function definitions in header files can lead to ODR violations [misc-definitions-in-headers]
@@ -177,3 +177,5 @@ int CD<T, int>::f() { // OK: partial template specialization.
}
constexpr int k = 1; // OK: constexpr variable has internal linkage.
+
+constexpr int f10() { return 0; } // OK: constexpr function definition.
OpenPOWER on IntegriCloud