connectivity/Module_connectivity.mk | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
New commits:
commit 8565cef55b172fd1b4825998b3e3762a530b6a6f
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Jan 12 15:35:58 2016 +0100
connectivity: remove MSVC 2012 specific hack
Change-Id: I78a25118d68ab7ad1db5240910f0974ba1e8381f
diff --git a/connectivity/Module_connectivity.mk
b/connectivity/Module_connectivity.mk
index dad2ef6..aee3178 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -110,23 +110,13 @@ $(eval $(call gb_Module_add_check_targets,connectivity,\
endif
ifeq ($(OS),WNT)
-# HACK: FIXME: TODO: only disabled to not make the build fail when targeting
Win XP with VS 2012
-#warn:legacy.osl:2120:7064:connectivity/source/commontools/dbmetadata.cxx:177:
caught an exception!
-#in function:const class rtl::OUString &__cdecl
dbtools::`anonymous-namespace'::lcl_getConnectionStringSetting(const struct
dbtools::DatabaseMetaData_Impl &,class boost::optional<class rtl::OUString>
&,class rtl::OUString (__cdecl com::sun::star::sdbc::XDatabaseMetaData::*
)(void))
-#type: com.sun.star.sdbc.SQLException
-#message: Fehler bei einem aus mehreren Schritten bestehenden OLE DB-Vorgang.
Pr�fen Sie die einzelnen OLE DB-Statuswerte, falls vorhanden. Daten wurden
nicht verarbeitet .
-#context: class connectivity::ado::ODatabaseMetaData
-#
-#Assertion failed: this->is_initialized(), file
C:\cygwin\home\buildslave\build\workdir\wntmsci14.pro\UnpackedTarball\boost\boost/optional/optional.hpp,
line 638
-
-ifneq ($(VCVER)_$(WINDOWS_SDK_VERSION),110_70)
+# "ADO is not available on 64bit" said the commit
ifneq ($(CPUNAME),X86_64)
$(eval $(call gb_Module_add_check_targets,connectivity,\
CppunitTest_connectivity_ado \
))
endif
endif
-endif
ifneq ($(filter QADEVOOO,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_subsequentcheck_targets,connectivity,\
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
