C++: Clean up multiply defined functions.

geoffw0 · geoffw0 · commit 4d6125841d42 · 2020-09-17T11:48:26.000+01:00
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/string.cpp b/cpp/ql/test/library-tests/dataflow/taint-tests/string.cpp
@@ -14,10 +14,10 @@ char *user_input() {
   return source();
 }
 
-void sink(const char *s) {};
-void sink(const std::string &s) {};
+void sink(const char *s);
+void sink(const std::string &s);
 void sink(const char *filename, const char *mode);
-void sink(char) {}
+void sink(char);
 
 void test_string()
 {
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/stringstream.cpp b/cpp/ql/test/library-tests/dataflow/taint-tests/stringstream.cpp
@@ -10,18 +10,18 @@ namespace ns_char
 	char source();
 }
 
-void sink(int i) {};
+void sink(int i);
 
-void sink(const std::string &s) {};
+void sink(const std::string &s);
 
 template<class charT>
-void sink(const std::basic_ostream<charT> &s) {};
+void sink(const std::basic_ostream<charT> &s);
 
 template<class charT>
-void sink(const std::basic_istream<charT> &s) {};
+void sink(const std::basic_istream<charT> &s);
 
 template<class charT>
-void sink(const std::basic_iostream<charT> &s) {};
+void sink(const std::basic_iostream<charT> &s);
 
 void test_stringstream_string(int amount)
 {

Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,10 @@ char *user_input() {`
`14`	`14`	`return source();`
`15`	`15`	`}`
`16`	`16`
`17`		`-void sink(const char *s) {};`
`18`		`-void sink(const std::string &s) {};`
	`17`	`+void sink(const char *s);`
	`18`	`+void sink(const std::string &s);`
`19`	`19`	`void sink(const char filename, const char mode);`
`20`		`-void sink(char) {}`
	`20`	`+void sink(char);`
`21`	`21`
`22`	`22`	`void test_string()`
`23`	`23`	`{`