RepositoryExternal.mk | 2 +- binaryurp/source/binaryany.cxx | 3 --- sal/rtl/locale.cxx | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-)
New commits: commit 5499d4c352567aacd108663af32c056e083fc8de Author: Michael Stahl <mst...@redhat.com> Date: Wed Feb 12 20:26:27 2014 +0100 Revert "cid#707663 uninitialized pointer field" This reverts commit 571d116d2805827bdef7d32983697bcdc5f9c78e. diff --git a/binaryurp/source/binaryany.cxx b/binaryurp/source/binaryany.cxx index c2cb74a..a56663a 100644 --- a/binaryurp/source/binaryany.cxx +++ b/binaryurp/source/binaryany.cxx @@ -31,7 +31,6 @@ namespace binaryurp { BinaryAny::BinaryAny() throw () { uno_any_construct(&data_, 0, 0, 0); - data_.pReserved = NULL; } BinaryAny::BinaryAny(css::uno::TypeDescription const & type, void * value) commit 169bc8f7906c364c75902d85707d1a5e2dffb61e Author: Michael Stahl <mst...@redhat.com> Date: Wed Feb 12 20:16:59 2014 +0100 Revert "cid#707662 uninitialized pointer field" This reverts commit 5523275482686d1e49e9b5dcf70b1c8451628f6c. Makes every JunitTest crash and burn; clearly pReserved is sometimes initialized and then overwritten with 0. Change-Id: I0e9958149de14a23826feef0b1a32c9d374e4d13 diff --git a/binaryurp/source/binaryany.cxx b/binaryurp/source/binaryany.cxx index 5dbf87b..c2cb74a 100644 --- a/binaryurp/source/binaryany.cxx +++ b/binaryurp/source/binaryany.cxx @@ -51,7 +51,6 @@ BinaryAny::BinaryAny(uno_Any const & raw) throw () { BinaryAny::BinaryAny(BinaryAny const & other) throw () { uno_type_any_construct(&data_, other.data_.pData, other.data_.pType, 0); - data_.pReserved = NULL; } BinaryAny::~BinaryAny() throw () { commit c3891d88fc12055298f9d197d4ddfcb1dab9647b Author: Michael Stahl <mst...@redhat.com> Date: Wed Feb 12 20:07:50 2014 +0100 Revert "cid#707661 uninitialized pointer field" This reverts commit e453ba963e624eb6829abc28beb0abe4c92be30c. Makes every JunitTest crash and burn; clearly pReserved is sometimes initialized and then overwritten with 0. Change-Id: I4d280770cecf131d1bbcfb9e2550c89b74150c1d diff --git a/binaryurp/source/binaryany.cxx b/binaryurp/source/binaryany.cxx index 66a1a38..5dbf87b 100644 --- a/binaryurp/source/binaryany.cxx +++ b/binaryurp/source/binaryany.cxx @@ -39,7 +39,6 @@ BinaryAny::BinaryAny(css::uno::TypeDescription const & type, void * value) { assert(type.is()); uno_any_construct(&data_, value, type.get(), 0); - data_.pReserved = NULL; } BinaryAny::BinaryAny(uno_Any const & raw) throw () { commit 6fa0b370472d7cf59ea26ac91a1a5c5d3291d0ce Author: Michael Stahl <mst...@redhat.com> Date: Wed Feb 12 17:01:35 2014 +0100 remove "n" that i somehow managed to add (no doubt in state of delirium) Change-Id: I71e23c43f14feae0c3b3e0f10a74ee22ccaab7f2 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 23fce06..bb57257 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2343,7 +2343,7 @@ endef endif # SYSTEM_FIREBIRD else # !ENABLE_FIREBIRD_SDBC + gb_LinkTarget__use_firebird := # gb_LinkTarget__use_atomic_ops := # gb_LinkTarget__use_tommath := commit 56ff07a795aca516106bfde80cb32860065690a6 Author: Michael Stahl <mst...@redhat.com> Date: Wed Feb 12 13:04:46 2014 +0100 sal: fix some clang warning about implicit bool conversion Change-Id: I5ecaf73922c6a30add6e270b8abdfdb5c28fe4a5 diff --git a/sal/rtl/locale.cxx b/sal/rtl/locale.cxx index d075eda..642565f 100644 --- a/sal/rtl/locale.cxx +++ b/sal/rtl/locale.cxx @@ -316,7 +316,7 @@ sal_Int32 SAL_CALL rtl_locale_hashCode( rtl_Locale * This ) */ sal_Int32 SAL_CALL rtl_locale_equals( rtl_Locale * This, rtl_Locale * obj ) { - return This == obj; + return sal_Int32(This == obj); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits