Browse Source

ccanlint: Add more C++ keywords.

Andreas Schlick 15 years ago
parent
commit
9aa2e32a54
1 changed files with 26 additions and 4 deletions
  1. 26 4
      tools/ccanlint/tests/avoids_cpp_reserved.c

+ 26 - 4
tools/ccanlint/tests/avoids_cpp_reserved.c

@@ -54,15 +54,37 @@ static void check_headers_no_cpp(struct manifest *m,
 		err(1, "Creating temporary file %s", tmpsrc);
 		err(1, "Creating temporary file %s", tmpsrc);
 
 
 	contents = talloc_asprintf(tmpsrc,
 	contents = talloc_asprintf(tmpsrc,
+		   "#define alignas #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
 		   "#define class #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
 		   "#define class #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
-		   "#define private #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
+		   "#define constexpr #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
+		   "#define const_cast #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
+		   "#define decltype #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
+		   "#define delete #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
+		   "#define dynamic_cast #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
+		   "#define explicit #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
+		   "#define false #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
+		   "#define friend #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
+		   "#define mutable #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
+		   "#define namespace #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
+		   "#define new #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
+		   "#define nullptr #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
+		   "#define operator #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
 		   "#define public #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
 		   "#define public #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
+		   "#define private #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
 		   "#define protected #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
 		   "#define protected #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
+		   "#define reinterpret_cast #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
+		   "#define static_assert #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
+		   "#define static_cast #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
 		   "#define template #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
 		   "#define template #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
 		   "#define this #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
 		   "#define this #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
-		   "#define new #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
-		   "#define delete #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
-		   "#define friend #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
+		   "#define thread_local #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
+		   "#define throw #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
+		   "#define true #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
+		   "#define try #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
+		   "#define typeid #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
+		   "#define typename #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
+		   "#define using #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
+		   "#define virtual #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
 		   "#include <ccan/%s/%s.h>\n",
 		   "#include <ccan/%s/%s.h>\n",
 				   m->basename, m->basename);
 				   m->basename, m->basename);
 	if (write(fd, contents, strlen(contents)) != strlen(contents))
 	if (write(fd, contents, strlen(contents)) != strlen(contents))