diff options
| author | Michael Vogt <mvo@debian.org> | 2014-04-01 13:57:22 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-04-01 13:57:22 +0200 |
| commit | 8a1c9010137a8c49d9808f2db34b9ee277138986 (patch) | |
| tree | 5ec5c0103cb896407d8c9542fac0ec8ab3313602 /test/libapt/assert.h | |
| parent | fa55ccaa85ca8f85251300f5c5f574edc0c3ca71 (diff) | |
| parent | 417e83d0d79637266e04c98189c62ce85bcdf737 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
apt-pkg/deb/dpkgpm.cc
debian/apt.auto-removal.sh
debian/changelog
vendor/debian/sources.list.in
Diffstat (limited to 'test/libapt/assert.h')
| -rw-r--r-- | test/libapt/assert.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/test/libapt/assert.h b/test/libapt/assert.h index 113c057ed..357801592 100644 --- a/test/libapt/assert.h +++ b/test/libapt/assert.h @@ -1,11 +1,18 @@ #include <iostream> #include <cstdlib> +#include <apt-pkg/macros.h> + +#if __GNUC__ >= 4 + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wmissing-declarations" +#endif + #define equals(x,y) assertEquals(y, x, __LINE__) #define equalsNot(x,y) assertEqualsNot(y, x, __LINE__) template < typename X, typename Y > -void OutputAssertEqual(X expect, char const* compare, Y get, unsigned long const &line) { +APT_NORETURN void OutputAssertEqual(X expect, char const* compare, Y get, unsigned long const &line) { std::cerr << "Test FAILED: »" << expect << "« " << compare << " »" << get << "« at line " << line << std::endl; std::exit(EXIT_FAILURE); } @@ -111,3 +118,7 @@ void dumpVector(X vec) { v != vec.end(); ++v) std::cout << *v << std::endl; } + +#if __GNUC__ >= 4 + #pragma GCC diagnostic pop +#endif |