diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-04-06 15:08:02 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-04-06 15:10:06 +0200 |
| commit | d91d98a53612a972de368186415aa48698e074d9 (patch) | |
| tree | e2deb6d7991383ca55d59c8a7563ac6871c133dc /sal/inc | |
| parent | 743f22045c4ec08c46c259fc0ba240194a391457 (diff) | |
fix gcc-4.0.1 and/or 32bit build for string literals
Plain 0 is ambiguous to convert to either long or const char*,
and just adding an overload next to sal_Int32 would be a dupe if
they actually are the same type, so just go with plain int, which
is the sensible thing to do anyway.
Diffstat (limited to 'sal/inc')
| -rw-r--r-- | sal/inc/rtl/strbuf.hxx | 2 | ||||
| -rw-r--r-- | sal/inc/rtl/ustrbuf.hxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sal/inc/rtl/strbuf.hxx b/sal/inc/rtl/strbuf.hxx index 4500cf0f8de8..77113086c4a6 100644 --- a/sal/inc/rtl/strbuf.hxx +++ b/sal/inc/rtl/strbuf.hxx @@ -130,7 +130,7 @@ public: @param length the initial capacity. */ - explicit OStringBuffer(sal_Int32 length) + explicit OStringBuffer(int length) : pData(NULL) , nCapacity( length ) { diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx index 17deadd5de9e..a88710723435 100644 --- a/sal/inc/rtl/ustrbuf.hxx +++ b/sal/inc/rtl/ustrbuf.hxx @@ -125,7 +125,7 @@ public: @param length the initial capacity. */ - explicit OUStringBuffer(sal_Int32 length) + explicit OUStringBuffer(int length) : pData(NULL) , nCapacity( length ) { @@ -155,7 +155,7 @@ public: : pData(NULL) , nCapacity( N - 1 + 16 ) { - rtl_uStringbuffer_newFromStr_WithLength( &pData, literal, N - 1 ); + rtl_uString_newFromLiteral( &pData, literal, N - 1, 16 ); #ifdef RTL_STRING_UNITTEST rtl_string_unittest_const_literal = true; #endif |