[Libreoffice-commits] .: Branch 'libreoffice-4-0' - 2 commits - sal/inc sal/Library_sal.mk sal/osl sal/Package_inc.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Dec 6 00:29:25 PST 2012
sal/Library_sal.mk | 2 -
sal/Package_inc.mk | 1
sal/inc/rtl/oustringostreaminserter.hxx | 21 ---------------
sal/osl/all/compat.cxx | 42 +++++++++++++++++++++++++++++++
sal/osl/all/semaphor.c | 43 --------------------------------
5 files changed, 43 insertions(+), 66 deletions(-)
New commits:
commit 9e7df8efe11f9a8a5d394faf43a9ea1ecb738968
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Dec 6 09:13:53 2012 +0100
API CHANGE: drop obsolete rtl/oustringostreaminserter.hxx
...its functionality moved directly into rtl/ustring.hxx
Change-Id: I5a1af63a4fd61c71e6594f1fab0c17f503fdd1c5
(cherry picked from commit 43b8e719d22bd115ecbd71e48be8aae42ed61a0d)
diff --git a/sal/Package_inc.mk b/sal/Package_inc.mk
index 0e91e08..425db1d 100644
--- a/sal/Package_inc.mk
+++ b/sal/Package_inc.mk
@@ -81,7 +81,6 @@ $(eval $(call gb_Package_add_file,sal_inc,inc/rtl/malformeduriexception.hxx,rtl/
$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/math.h,rtl/math.h))
$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/math.hxx,rtl/math.hxx))
$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/memory.h,rtl/memory.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/oustringostreaminserter.hxx,rtl/oustringostreaminserter.hxx))
$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/process.h,rtl/process.h))
$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/random.h,rtl/random.h))
$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/ref.hxx,rtl/ref.hxx))
diff --git a/sal/inc/rtl/oustringostreaminserter.hxx b/sal/inc/rtl/oustringostreaminserter.hxx
deleted file mode 100644
index e29c637..0000000
--- a/sal/inc/rtl/oustringostreaminserter.hxx
+++ /dev/null
@@ -1,21 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef INCLUDED_RTL_OUSTRINGOSTREAMINSERTER_HXX
-#define INCLUDED_RTL_OUSTRINGOSTREAMINSERTER_HXX
-
-// depreacted header... include ustring.hxx instead
-#ifndef CPPUNIT_VERSION // protect agaisnt WaE with include all_headers in qa of strings
-#warning "deprecated header, include rtl/ustring.hxx instead"
-#endif
-#include <rtl/ustring.hxx>
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 7b0df11e4fd3c3de771050a3e4be904b21a3b565
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Dec 6 09:06:55 2012 +0100
Put stubs for removed functionality into compat.cxx
Change-Id: I634c6c699f8573113cdf0763c2cc83dcc04b0b0e
(cherry picked from commit c4a8ba908cca0228336330ae72e5d7ad29a6ed2e)
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 51823fe..d4fae98 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -97,6 +97,7 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,sal,\
endif
$(eval $(call gb_Library_add_exception_objects,sal,\
+ sal/osl/all/compat \
sal/osl/all/debugbase \
sal/osl/all/loadmodulerelative \
sal/osl/all/log \
@@ -138,7 +139,6 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
))
$(eval $(call gb_Library_add_cobjects,sal,\
sal/osl/all/filepath \
- sal/osl/all/semaphor \
))
ifeq ($(OS),IOS)
diff --git a/sal/osl/all/compat.cxx b/sal/osl/all/compat.cxx
new file mode 100644
index 0000000..fb8a1ec
--- /dev/null
+++ b/sal/osl/all/compat.cxx
@@ -0,0 +1,42 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "sal/config.h"
+
+#include <cstdlib>
+
+#include "sal/types.h"
+
+// Stubs for removed functionality, to be killed when we bump sal SONAME
+
+extern "C" {
+
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL osl_acquireSemaphore(void *) {
+ for (;;) { std::abort(); } // avoid "must return a value" warnings
+}
+
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL osl_createSemaphore(sal_uInt32) {
+ for (;;) { std::abort(); } // avoid "must return a value" warnings
+}
+
+SAL_DLLPUBLIC_EXPORT void SAL_CALL osl_destroySemaphore(void *) {
+ std::abort();
+}
+
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL osl_releaseSemaphore(void *) {
+ for (;;) { std::abort(); } // avoid "must return a value" warnings
+}
+
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL osl_tryToAcquireSemaphore(void *) {
+ for (;;) { std::abort(); } // avoid "must return a value" warnings
+}
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/all/semaphor.c b/sal/osl/all/semaphor.c
deleted file mode 100644
index 5afb950..0000000
--- a/sal/osl/all/semaphor.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include <sal/types.h>
-
-// Stubs for removed functionality, to be killed when we bump sal SONAME
-
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL osl_createSemaphore(sal_uInt32 dummy)
-{
- (void)dummy;
- return NULL;
-}
-
-SAL_DLLPUBLIC_EXPORT void SAL_CALL osl_destroySemaphore(void* dummy)
-{
- (void)dummy;
-}
-
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL osl_acquireSemaphore(void* dummy)
-{
- (void)dummy;
- return sal_False;
-}
-
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL osl_tryToAcquireSemaphore(void* dummy)
-{
- (void)dummy;
- return sal_False;
-}
-
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL osl_releaseSemaphore(void* dummy)
-{
- (void)dummy;
- return sal_False;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list