aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Hirsch <w4rh4wk@bluephoenix.at>2018-03-09 16:40:20 +0100
committerJussi Pakkanen <jpakkane@gmail.com>2018-03-10 18:04:12 +0200
commitf6fd03485e6ab95aae766649f621a9b4260ea674 (patch)
treebae0d37f45dad5fc5eb1aba93ab4071768335902
parent31df4ae1640a23d5f30df9e766b8bf03ad88308d (diff)
downloadmeson-f6fd03485e6ab95aae766649f621a9b4260ea674.zip
meson-f6fd03485e6ab95aae766649f621a9b4260ea674.tar.gz
meson-f6fd03485e6ab95aae766649f621a9b4260ea674.tar.bz2
Fix C++ code used for doxygen test
-rw-r--r--test cases/frameworks/14 doxygen/include/comedian.h2
-rw-r--r--test cases/frameworks/14 doxygen/include/spede.h7
-rw-r--r--test cases/frameworks/14 doxygen/meson.build6
-rw-r--r--test cases/frameworks/14 doxygen/src/spede.cpp2
4 files changed, 10 insertions, 7 deletions
diff --git a/test cases/frameworks/14 doxygen/include/comedian.h b/test cases/frameworks/14 doxygen/include/comedian.h
index 97b5086..d62b283 100644
--- a/test cases/frameworks/14 doxygen/include/comedian.h
+++ b/test cases/frameworks/14 doxygen/include/comedian.h
@@ -11,7 +11,7 @@ namespace Comedy {
* Do the thing people want to happen.
*/
virtual void tell_joke() = 0;
- virtual ~Comedian();
+ virtual ~Comedian(){};
};
}
diff --git a/test cases/frameworks/14 doxygen/include/spede.h b/test cases/frameworks/14 doxygen/include/spede.h
index 8175465..380708a 100644
--- a/test cases/frameworks/14 doxygen/include/spede.h
+++ b/test cases/frameworks/14 doxygen/include/spede.h
@@ -29,10 +29,7 @@ namespace Comedy {
throw std::runtime_error("Not implemented");
}
+ private:
+ int num_movies; ///< How many movies has he done.
};
-
-
-private:
-
- int num_movies; ///< How many movies has he done.
}
diff --git a/test cases/frameworks/14 doxygen/meson.build b/test cases/frameworks/14 doxygen/meson.build
index 55df316..023aa0e 100644
--- a/test cases/frameworks/14 doxygen/meson.build
+++ b/test cases/frameworks/14 doxygen/meson.build
@@ -1,5 +1,11 @@
project('doxygen test', 'cpp', version : '0.1.0')
+spede_inc = include_directories('include')
+
+spede_src = [ 'src/spede.cpp' ]
+
+spede_lib = library('spede', spede_src, include_directories: spede_inc)
+
doxygen = find_program('doxygen', required : false)
if not doxygen.found()
error('MESON_SKIP_TEST doxygen not found.')
diff --git a/test cases/frameworks/14 doxygen/src/spede.cpp b/test cases/frameworks/14 doxygen/src/spede.cpp
index 31c8fb2..d382902 100644
--- a/test cases/frameworks/14 doxygen/src/spede.cpp
+++ b/test cases/frameworks/14 doxygen/src/spede.cpp
@@ -42,7 +42,7 @@ int gesticulate(int force) {
Spede::Spede() : num_movies(100) {
}
-Spede::slap_forehead() {
+void Spede::slap_forehead() {
gesticulate(42);
}