summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-01-23 15:49:41 +0100
committerMichael Stahl <mstahl@redhat.com>2015-01-23 15:50:27 +0100
commit4c752c44f8a0857c4f2dbd61aff6b2d10cf3b5e5 (patch)
tree256620f452caa069d3cfb64a15b7e2f815abb7ca
parentaf017ac50aeaef3a55e25ed2283dbf0d116a1968 (diff)
sal: remove GCC 4.6 check, it does not claim C++11 support
Change-Id: Ica0ff6a36e64c732000ef900fa7aeafaf6da3e04
-rw-r--r--include/rtl/strbuf.hxx3
-rw-r--r--include/rtl/ustrbuf.hxx3
2 files changed, 0 insertions, 6 deletions
diff --git a/include/rtl/strbuf.hxx b/include/rtl/strbuf.hxx
index 7c8abf099191..f0fd1f11b013 100644
--- a/include/rtl/strbuf.hxx
+++ b/include/rtl/strbuf.hxx
@@ -97,8 +97,6 @@ public:
rtl_string_new_WithLength( &pData, length );
}
#if __cplusplus >= 201103L
- // GCC 4.6 lacks delegating ctors
-#if defined(__clang__) || !defined(__GNUC__) || (__GNUC__ > 4) || (__GNUC_MINOR__ > 6)
explicit OStringBuffer(unsigned int length)
: OStringBuffer(static_cast<int>(length))
{
@@ -118,7 +116,6 @@ public:
explicit OStringBuffer(char) = delete;
explicit OStringBuffer(sal_Unicode) = delete;
#endif
-#endif
/**
Constructs a string buffer so that it represents the same
diff --git a/include/rtl/ustrbuf.hxx b/include/rtl/ustrbuf.hxx
index d205c63c6984..fdec924613fe 100644
--- a/include/rtl/ustrbuf.hxx
+++ b/include/rtl/ustrbuf.hxx
@@ -92,8 +92,6 @@ public:
rtl_uString_new_WithLength( &pData, length );
}
#if __cplusplus >= 201103L
- // GCC 4.6 lacks delegating ctors
-#if defined(__clang__) || !defined(__GNUC__) || (__GNUC__ > 4) || (__GNUC_MINOR__ > 6)
explicit OUStringBuffer(unsigned int length)
: OUStringBuffer(static_cast<int>(length))
{
@@ -113,7 +111,6 @@ public:
explicit OUStringBuffer(char) = delete;
explicit OUStringBuffer(sal_Unicode) = delete;
#endif
-#endif
/**
Constructs a string buffer so that it represents the same