diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-10-02 18:42:07 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-10-02 20:00:18 +0200 |
| commit | 9086a4bbd38b9a5320525392affe495e7772796a (patch) | |
| tree | 34f0015f0c9f5f2cfb16892801fda886a0fd4f12 /sal | |
| parent | remove HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE check and macro (diff) | |
| download | core-9086a4bbd38b9a5320525392affe495e7772796a.tar.gz core-9086a4bbd38b9a5320525392affe495e7772796a.zip | |
remove checks of __GCC_MINOR__ that are always true in GCC 4.6 or later
Change-Id: I4412a0c1e4dee94cd717f24b8df5e257d895f721
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/signal.c | 4 | ||||
| -rw-r--r-- | sal/qa/rtl/strings/test_ostring_concat.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sal/osl/unx/signal.c b/sal/osl/unx/signal.c index d8d2190efdb0..ba4a32579d9b 100644 --- a/sal/osl/unx/signal.c +++ b/sal/osl/unx/signal.c @@ -893,14 +893,14 @@ static void DUMPCURRENTALLOCS(void) { VALGRIND_PRINTF( "=== start memcheck dump of active allocations ===\n" ); -#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) +#ifdef __GNUC__ # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wunused-but-set-variable" #endif VALGRIND_DO_LEAK_CHECK; -#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) +#ifdef __GNUC__ # pragma GCC diagnostic pop #endif diff --git a/sal/qa/rtl/strings/test_ostring_concat.cxx b/sal/qa/rtl/strings/test_ostring_concat.cxx index 9c5cbd940bbc..7988a3be6992 100644 --- a/sal/qa/rtl/strings/test_ostring_concat.cxx +++ b/sal/qa/rtl/strings/test_ostring_concat.cxx @@ -83,7 +83,7 @@ void test::ostring::StringConcat::checkConcat() TYPES_ASSERT_EQUAL(( typeid( OStringConcat< OString, const char* > )), typeid( OString( "foo" ) + d3 )); CPPUNIT_ASSERT_EQUAL( OString( "fooabc" ), OString( OString( "foo" ) + d4 )); TYPES_ASSERT_EQUAL(( typeid( OStringConcat< OString, char* > )), typeid( OString( "foo" ) + d4 )); -#if __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ > 1 ) +#ifdef __GNUC__ CPPUNIT_ASSERT_EQUAL( OString( "foobar" ), OString( OStringBuffer( "foo" ) + OString( "bar" ))); TYPES_ASSERT_EQUAL(( typeid( OStringConcat< OStringBuffer, OString > )), typeid( OStringBuffer( "foo" ) + OString( "bar" ))); #endif |