diff -Nru libwps-0.4.7/aclocal.m4 libwps-0.4.8/aclocal.m4 --- libwps-0.4.7/aclocal.m4 2017-07-16 08:05:51.000000000 +0000 +++ libwps-0.4.8/aclocal.m4 2017-11-15 10:22:43.000000000 +0000 @@ -20,6 +20,44 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_require_defined.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_REQUIRE_DEFINED(MACRO) +# +# DESCRIPTION +# +# AX_REQUIRE_DEFINED is a simple helper for making sure other macros have +# been defined and thus are available for use. This avoids random issues +# where a macro isn't expanded. Instead the configure script emits a +# non-fatal: +# +# ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found +# +# It's like AC_REQUIRE except it doesn't expand the required macro. +# +# Here's an example: +# +# AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG]) +# +# LICENSE +# +# Copyright (c) 2014 Mike Frysinger +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_DEFUN([AX_REQUIRE_DEFINED], [dnl + m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])]) +])dnl AX_REQUIRE_DEFINED + # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # serial 12 (pkg-config-0.29.2) @@ -1486,6 +1524,10 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([m4/ax_cxx_compile_stdcxx.m4]) +m4_include([m4/ax_cxx_compile_stdcxx_11.m4]) +m4_include([m4/ax_gcc_func_attribute.m4]) +m4_include([m4/dlp_fallthrough.m4]) m4_include([m4/libtool.m4]) m4_include([m4/ltoptions.m4]) m4_include([m4/ltsugar.m4]) diff -Nru libwps-0.4.7/autogen.sh libwps-0.4.8/autogen.sh --- libwps-0.4.7/autogen.sh 2013-11-20 07:47:46.000000000 +0000 +++ libwps-0.4.8/autogen.sh 2017-11-15 10:22:11.000000000 +0000 @@ -3,7 +3,7 @@ LIBTOOLIZEFOUND="0" -aclocal --version > /dev/null 2> /dev/null || { +aclocal -I m4 --version > /dev/null 2> /dev/null || { echo "error: aclocal not found" exit 1 } diff -Nru libwps-0.4.7/build/Makefile.in libwps-0.4.8/build/Makefile.in --- libwps-0.4.7/build/Makefile.in 2017-07-16 08:05:52.000000000 +0000 +++ libwps-0.4.8/build/Makefile.in 2017-11-15 10:22:45.000000000 +0000 @@ -89,10 +89,13 @@ host_triplet = @host@ subdir = build ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \ + $(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \ + $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \ + $(top_srcdir)/m4/dlp_fallthrough.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -215,6 +218,7 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff -Nru libwps-0.4.7/build/win32/libwps.dsp libwps-0.4.8/build/win32/libwps.dsp --- libwps-0.4.7/build/win32/libwps.dsp 2016-09-23 09:25:41.000000000 +0000 +++ libwps-0.4.8/build/win32/libwps.dsp 1970-01-01 00:00:00.000000000 +0000 @@ -1,466 +0,0 @@ -# Microsoft Developer Studio Project File - Name="libwps" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=libwps - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "libwps.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "libwps.mak" CFG="libwps - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libwps - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "libwps - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "libwps - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /YX /FD " /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /D "NDEBUG" /D "WIN32" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"Release\lib\libwps-0.3.lib" - -!ELSEIF "$(CFG)" == "libwps - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /GR /GX /ZI /Od /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"Debug\lib\libwps-0.3.lib" - -!ENDIF - -# Begin Target - -# Name "libwps - Win32 Release" -# Name "libwps - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\src\lib\libwps_internal.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\libwps_tools_win.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\DosWord.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\Lotus.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\LotusGraph.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\LotusSpreadsheet.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\LotusStyleManager.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\MSWrite.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\Quattro.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\QuattroSpreadsheet.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WKS4.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WKS4Format.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WKS4Spreadsheet.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WKSContentListener.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WKSParser.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WKSSubDocument.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPS4.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPS4Graph.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPS4Text.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPS8.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPS8Graph.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPS8Struct.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPS8Table.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPS8Text.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPS8TextStyle.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSCell.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSContentListener.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSDebug.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSDocument.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSFont.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSGraphicShape.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSGraphicStyle.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSHeader.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSList.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSOLE1Parser.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSOLEParser.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSPageSpan.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSParagraph.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSParser.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSStringStream.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSStream.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSSubDocument.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSTable.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSTextParser.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSTextSubDocument.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\inc\libwps\libwps.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\libwps_internal.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\libwps_tools_win.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\DosWord.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\Lotus.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\LotusGraph.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\LotusSpreadsheet.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\LotusStyleManager.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\MSWrite.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\Quattro.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\QuattroSpreadsheet.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WKS4.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WKS4Format.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WKS4Spreadsheet.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WKSContentListener.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WKSParser.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WKSSubDocument.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPS4.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPS4Graph.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPS4Text.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPS8.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPS8Graph.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPS8Struct.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPS8Table.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPS8Text.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPS8TextStyle.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSCell.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSContentListener.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSDebug.h -# End Source File -# Begin Source File - -SOURCE=..\..\inc\libwps\WPSDocument.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSEntry.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSFont.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSGraphicShape.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSGraphicStyle.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSHeader.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSList.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSOLE1Parser.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSOLEParser.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSPageSpan.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSParagraph.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSParser.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSPosition.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSStringStream.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSStream.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSSubDocument.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSTable.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSTextParser.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\lib\WPSTextSubDocument.h -# End Source File -# End Group -# End Target -# End Project diff -Nru libwps-0.4.7/build/win32/libwps.dsw libwps-0.4.8/build/win32/libwps.dsw --- libwps-0.4.7/build/win32/libwps.dsw 2015-02-03 19:25:32.000000000 +0000 +++ libwps-0.4.8/build/win32/libwps.dsw 1970-01-01 00:00:00.000000000 +0000 @@ -1,120 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "libwps"=".\libwps.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "wks2csv"=".\wks2csv.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libwps - End Project Dependency -}}} - -############################################################################### - -Project: "wks2raw"=".\wks2raw.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libwps - End Project Dependency -}}} - -############################################################################### - -Project: "wks2text"=".\wks2text.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libwps - End Project Dependency -}}} - - -############################################################################### - -Project: "wps2html"=".\wps2html.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libwps - End Project Dependency -}}} - -############################################################################### - -Project: "wps2raw"=".\wps2raw.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libwps - End Project Dependency -}}} - -############################################################################### - -Project: "wps2text"=".\wps2text.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libwps - End Project Dependency -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff -Nru libwps-0.4.7/build/win32/libwps.vcproj libwps-0.4.8/build/win32/libwps.vcproj --- libwps-0.4.7/build/win32/libwps.vcproj 2016-09-23 09:26:05.000000000 +0000 +++ libwps-0.4.8/build/win32/libwps.vcproj 1970-01-01 00:00:00.000000000 +0000 @@ -1,1276 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libwps-0.4.7/build/win32/libwps.vcproj.sln libwps-0.4.8/build/win32/libwps.vcproj.sln --- libwps-0.4.7/build/win32/libwps.vcproj.sln 2015-01-11 11:39:23.000000000 +0000 +++ libwps-0.4.8/build/win32/libwps.vcproj.sln 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwps", "libwps.vcproj", "{C24D5976-7DA0-4B1E-838F-6ADCC835B5E1}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wps2html", "wps2html.vcproj", "{D6B45938-C154-436B-AA28-29C35A8A691F}" - ProjectSection(ProjectDependencies) = postProject - {C24D5976-7DA0-4B1E-838F-6ADCC835B5E1} = {C24D5976-7DA0-4B1E-838F-6ADCC835B5E1} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wps2raw", "wps2raw.vcproj", "{0E6CBB23-DFDC-4194-A2CC-F030F6B7D730}" - ProjectSection(ProjectDependencies) = postProject - {C24D5976-7DA0-4B1E-838F-6ADCC835B5E1} = {C24D5976-7DA0-4B1E-838F-6ADCC835B5E1} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wps2text", "wps2text.vcproj", "{FCB2AC04-1AE5-4E43-A80B-BBAA9FA00F5A}" - ProjectSection(ProjectDependencies) = postProject - {C24D5976-7DA0-4B1E-838F-6ADCC835B5E1} = {C24D5976-7DA0-4B1E-838F-6ADCC835B5E1} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C24D5976-7DA0-4B1E-838F-6ADCC835B5E1}.Debug|Win32.ActiveCfg = Debug|Win32 - {C24D5976-7DA0-4B1E-838F-6ADCC835B5E1}.Debug|Win32.Build.0 = Debug|Win32 - {C24D5976-7DA0-4B1E-838F-6ADCC835B5E1}.Release|Win32.ActiveCfg = Release|Win32 - {C24D5976-7DA0-4B1E-838F-6ADCC835B5E1}.Release|Win32.Build.0 = Release|Win32 - {D6B45938-C154-436B-AA28-29C35A8A691F}.Debug|Win32.ActiveCfg = Debug|Win32 - {D6B45938-C154-436B-AA28-29C35A8A691F}.Debug|Win32.Build.0 = Debug|Win32 - {D6B45938-C154-436B-AA28-29C35A8A691F}.Release|Win32.ActiveCfg = Release|Win32 - {D6B45938-C154-436B-AA28-29C35A8A691F}.Release|Win32.Build.0 = Release|Win32 - {0E6CBB23-DFDC-4194-A2CC-F030F6B7D730}.Debug|Win32.ActiveCfg = Debug|Win32 - {0E6CBB23-DFDC-4194-A2CC-F030F6B7D730}.Debug|Win32.Build.0 = Debug|Win32 - {0E6CBB23-DFDC-4194-A2CC-F030F6B7D730}.Release|Win32.ActiveCfg = Release|Win32 - {0E6CBB23-DFDC-4194-A2CC-F030F6B7D730}.Release|Win32.Build.0 = Release|Win32 - {FCB2AC04-1AE5-4E43-A80B-BBAA9FA00F5A}.Debug|Win32.ActiveCfg = Debug|Win32 - {FCB2AC04-1AE5-4E43-A80B-BBAA9FA00F5A}.Debug|Win32.Build.0 = Debug|Win32 - {FCB2AC04-1AE5-4E43-A80B-BBAA9FA00F5A}.Release|Win32.ActiveCfg = Release|Win32 - {FCB2AC04-1AE5-4E43-A80B-BBAA9FA00F5A}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff -Nru libwps-0.4.7/build/win32/libwps.vcxproj libwps-0.4.8/build/win32/libwps.vcxproj --- libwps-0.4.7/build/win32/libwps.vcxproj 2016-09-23 09:26:23.000000000 +0000 +++ libwps-0.4.8/build/win32/libwps.vcxproj 1970-01-01 00:00:00.000000000 +0000 @@ -1,339 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {C24D5976-7DA0-4B1E-838F-6ADCC835B5E1} - libwps - - - - StaticLibrary - false - - - StaticLibrary - false - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - .\Release\ - .\Release\ - .\Debug\ - .\Debug\ - - - - MaxSpeed - OnlyExplicitInline - ..\..\inc;$(LIBREVENGE_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - false - true - .\Release/libwps.pch - .\Release/ - .\Release/ - .\Release/ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Release\lib\libwps-0.3.lib - true - - - true - .\Release/libwps.bsc - - - - - Disabled - ..\..\inc;$(LIBREVENGE_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);%(AdditionalIncludeDirectories) - _DEBUG;DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - false - true - .\Debug/libwps.pch - .\Debug/ - .\Debug/ - .\Debug/ - Level3 - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Debug\lib\libwps-0.3.lib - true - - - true - .\Debug/libwps.bsc - - - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libwps-0.4.7/build/win32/libwps.vcxproj.sln libwps-0.4.8/build/win32/libwps.vcxproj.sln --- libwps-0.4.7/build/win32/libwps.vcxproj.sln 2015-01-11 11:39:23.000000000 +0000 +++ libwps-0.4.8/build/win32/libwps.vcxproj.sln 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwps", "libwps.vcxproj", "{C24D5976-7DA0-4B1E-838F-6ADCC835B5E1}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wps2html", "wps2html.vcxproj", "{D6B45938-C154-436B-AA28-29C35A8A691F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wps2raw", "wps2raw.vcxproj", "{0E6CBB23-DFDC-4194-A2CC-F030F6B7D730}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wps2text", "wps2text.vcxproj", "{FCB2AC04-1AE5-4E43-A80B-BBAA9FA00F5A}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C24D5976-7DA0-4B1E-838F-6ADCC835B5E1}.Debug|Win32.ActiveCfg = Debug|Win32 - {C24D5976-7DA0-4B1E-838F-6ADCC835B5E1}.Debug|Win32.Build.0 = Debug|Win32 - {C24D5976-7DA0-4B1E-838F-6ADCC835B5E1}.Release|Win32.ActiveCfg = Release|Win32 - {C24D5976-7DA0-4B1E-838F-6ADCC835B5E1}.Release|Win32.Build.0 = Release|Win32 - {D6B45938-C154-436B-AA28-29C35A8A691F}.Debug|Win32.ActiveCfg = Debug|Win32 - {D6B45938-C154-436B-AA28-29C35A8A691F}.Debug|Win32.Build.0 = Debug|Win32 - {D6B45938-C154-436B-AA28-29C35A8A691F}.Release|Win32.ActiveCfg = Release|Win32 - {D6B45938-C154-436B-AA28-29C35A8A691F}.Release|Win32.Build.0 = Release|Win32 - {0E6CBB23-DFDC-4194-A2CC-F030F6B7D730}.Debug|Win32.ActiveCfg = Debug|Win32 - {0E6CBB23-DFDC-4194-A2CC-F030F6B7D730}.Debug|Win32.Build.0 = Debug|Win32 - {0E6CBB23-DFDC-4194-A2CC-F030F6B7D730}.Release|Win32.ActiveCfg = Release|Win32 - {0E6CBB23-DFDC-4194-A2CC-F030F6B7D730}.Release|Win32.Build.0 = Release|Win32 - {FCB2AC04-1AE5-4E43-A80B-BBAA9FA00F5A}.Debug|Win32.ActiveCfg = Debug|Win32 - {FCB2AC04-1AE5-4E43-A80B-BBAA9FA00F5A}.Debug|Win32.Build.0 = Debug|Win32 - {FCB2AC04-1AE5-4E43-A80B-BBAA9FA00F5A}.Release|Win32.ActiveCfg = Release|Win32 - {FCB2AC04-1AE5-4E43-A80B-BBAA9FA00F5A}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff -Nru libwps-0.4.7/build/win32/Makefile.am libwps-0.4.8/build/win32/Makefile.am --- libwps-0.4.7/build/win32/Makefile.am 2015-02-03 19:25:32.000000000 +0000 +++ libwps-0.4.8/build/win32/Makefile.am 2017-11-14 10:01:33.000000000 +0000 @@ -1,30 +1,3 @@ EXTRA_DIST = \ compile-resource \ - lt-compile-resource \ - \ - libwps.dsw \ - libwps.dsp \ - wks2csv.dsp \ - wks2raw.dsp \ - wks2text.dsp \ - wps2html.dsp \ - wps2raw.dsp \ - wps2text.dsp \ - \ - libwps.vcproj.sln \ - libwps.vcproj \ - wks2csv.vcproj \ - wks2raw.vcproj \ - wks2text.vcproj \ - wps2html.vcproj \ - wps2raw.vcproj \ - wps2text.vcproj \ - \ - libwps.vcxproj.sln \ - libwps.vcxproj \ - wks2csv.vcxproj \ - wks2raw.vcxproj \ - wks2text.vcxproj \ - wps2html.vcxproj \ - wps2raw.vcxproj \ - wps2text.vcxproj + lt-compile-resource diff -Nru libwps-0.4.7/build/win32/Makefile.in libwps-0.4.8/build/win32/Makefile.in --- libwps-0.4.7/build/win32/Makefile.in 2017-07-16 08:05:52.000000000 +0000 +++ libwps-0.4.8/build/win32/Makefile.in 2017-11-15 10:22:45.000000000 +0000 @@ -89,10 +89,13 @@ host_triplet = @host@ subdir = build/win32 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \ + $(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \ + $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \ + $(top_srcdir)/m4/dlp_fallthrough.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -155,6 +158,7 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -273,34 +277,7 @@ top_srcdir = @top_srcdir@ EXTRA_DIST = \ compile-resource \ - lt-compile-resource \ - \ - libwps.dsw \ - libwps.dsp \ - wks2csv.dsp \ - wks2raw.dsp \ - wks2text.dsp \ - wps2html.dsp \ - wps2raw.dsp \ - wps2text.dsp \ - \ - libwps.vcproj.sln \ - libwps.vcproj \ - wks2csv.vcproj \ - wks2raw.vcproj \ - wks2text.vcproj \ - wps2html.vcproj \ - wps2raw.vcproj \ - wps2text.vcproj \ - \ - libwps.vcxproj.sln \ - libwps.vcxproj \ - wks2csv.vcxproj \ - wks2raw.vcxproj \ - wks2text.vcxproj \ - wps2html.vcxproj \ - wps2raw.vcxproj \ - wps2text.vcxproj + lt-compile-resource all: all-am diff -Nru libwps-0.4.7/build/win32/wks2csv.dsp libwps-0.4.8/build/win32/wks2csv.dsp --- libwps-0.4.7/build/win32/wks2csv.dsp 2015-02-03 19:25:32.000000000 +0000 +++ libwps-0.4.8/build/win32/wks2csv.dsp 1970-01-01 00:00:00.000000000 +0000 @@ -1,106 +0,0 @@ -# Microsoft Developer Studio Project File - Name="wks2csv" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=wks2csv - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "wks2csv.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "wks2csv.mak" CFG="wks2csv - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "wks2csv - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "wks2csv - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "wks2csv - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -MTL=midl.exe -# ADD BASE MTL /nologo /win32 -# ADD MTL /nologo /win32 -# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\src\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c -# ADD CPP /nologo /MT /W3 /GX /I "..\..\src\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 librevenge-stream-0.0.lib libwps-0.3.lib librevenge-0.0.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\wks2csv.exe" /libpath:"Release\lib" -# ADD LINK32 librevenge-stream-0.0.lib libwps-0.3.lib librevenge-0.0.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\wks2csv.exe" /libpath:"Release\lib" -# SUBTRACT LINK32 /nodefaultlib - -!ELSEIF "$(CFG)" == "wks2csv - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -MTL=midl.exe -# ADD BASE MTL /nologo /win32 -# ADD MTL /nologo /win32 -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\src\lib" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c -# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\src\lib" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 libwps-0.3.lib librevenge-stream-0.0.lib librevenge-0.0.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\wks2csv.exe" /libpath:"Debug\lib" -# ADD LINK32 libwps-0.3.lib librevenge-stream-0.0.lib librevenge-0.0.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\wks2csv.exe" /libpath:"Debug\lib" -# SUBTRACT LINK32 /nodefaultlib - -!ENDIF - -# Begin Target - -# Name "wks2csv - Win32 Release" -# Name "wks2csv - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" -# Begin Source File - -SOURCE=..\..\src\conv\wks2csv\wks2csv.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl;inc;xsd" -# End Group -# End Target -# End Project diff -Nru libwps-0.4.7/build/win32/wks2csv.vcproj libwps-0.4.8/build/win32/wks2csv.vcproj --- libwps-0.4.7/build/win32/wks2csv.vcproj 2015-02-03 19:25:32.000000000 +0000 +++ libwps-0.4.8/build/win32/wks2csv.vcproj 1970-01-01 00:00:00.000000000 +0000 @@ -1,235 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libwps-0.4.7/build/win32/wks2csv.vcxproj libwps-0.4.8/build/win32/wks2csv.vcxproj --- libwps-0.4.7/build/win32/wks2csv.vcxproj 2015-02-03 19:25:32.000000000 +0000 +++ libwps-0.4.8/build/win32/wks2csv.vcxproj 1970-01-01 00:00:00.000000000 +0000 @@ -1,148 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {0E6CBB23-DFDC-4194-A2CC-F030F6B7D730} - - - - Application - false - - - Application - false - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - .\Debug\ - .\Debug\ - true - .\Release\ - .\Release\ - false - - - - true - Win32 - .\Debug/wks2csv.tlb - - - - - Disabled - ..\..\inc;$(LIBREVENGE_INCLUDE_DIR);%(AdditionalIncludeDirectories) - _DEBUG;DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - .\Debug/wks2csv.pch - .\Debug/ - .\Debug/ - .\Debug/ - Level3 - true - EditAndContinue - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - libwps-0.3.lib;librevenge-stream-0.0.lib;librevenge-0.0.lib;%(AdditionalDependencies) - Debug\bin\wks2csv.exe - true - Debug\lib;$(LIBREVENGE_LIB_DIR);%(AdditionalLibraryDirectories) - true - .\Debug/wks2csv.pdb - Console - false - - - - - true - .\Debug/wks2csv.bsc - - - - - true - Win32 - .\Release/wks2csv.tlb - - - - - Disabled - ..\..\inc;$(LIBREVENGE_INCLUDE_DIR);%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - .\Release/wks2csv.pch - .\Release/ - .\Release/ - .\Release/ - Level3 - true - false - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - librevenge-stream-0.0.lib;libwps-0.3.lib;librevenge-0.0.lib;%(AdditionalDependencies) - Release\bin\wks2csv.exe - true - Release\lib;$(LIBREVENGE_LIB_DIR);%(AdditionalLibraryDirectories) - .\Release/wks2csv.pdb - Console - false - - - - - true - .\Release/wks2csv.bsc - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - - - {c24d5976-7da0-4b1e-838f-6adcc835b5e1} - false - - - - - - diff -Nru libwps-0.4.7/build/win32/wks2raw.dsp libwps-0.4.8/build/win32/wks2raw.dsp --- libwps-0.4.7/build/win32/wks2raw.dsp 2015-02-03 19:25:32.000000000 +0000 +++ libwps-0.4.8/build/win32/wks2raw.dsp 1970-01-01 00:00:00.000000000 +0000 @@ -1,106 +0,0 @@ -# Microsoft Developer Studio Project File - Name="wks2raw" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=wks2raw - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "wks2raw.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "wks2raw.mak" CFG="wks2raw - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "wks2raw - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "wks2raw - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "wks2raw - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -MTL=midl.exe -# ADD BASE MTL /nologo /win32 -# ADD MTL /nologo /win32 -# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\src\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c -# ADD CPP /nologo /MT /W3 /GX /I "..\..\src\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 librevenge-stream-0.0.lib libwps-0.3.lib librevenge-0.0.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\wks2raw.exe" /libpath:"Release\lib" -# ADD LINK32 librevenge-stream-0.0.lib libwps-0.3.lib librevenge-0.0.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\wks2raw.exe" /libpath:"Release\lib" -# SUBTRACT LINK32 /nodefaultlib - -!ELSEIF "$(CFG)" == "wks2raw - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -MTL=midl.exe -# ADD BASE MTL /nologo /win32 -# ADD MTL /nologo /win32 -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\src\lib" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c -# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\src\lib" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 libwps-0.3.lib librevenge-stream-0.0.lib librevenge-0.0.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\wks2raw.exe" /libpath:"Debug\lib" -# ADD LINK32 libwps-0.3.lib librevenge-stream-0.0.lib librevenge-0.0.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\wks2raw.exe" /libpath:"Debug\lib" -# SUBTRACT LINK32 /nodefaultlib - -!ENDIF - -# Begin Target - -# Name "wks2raw - Win32 Release" -# Name "wks2raw - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" -# Begin Source File - -SOURCE=..\..\src\conv\wks2raw\wks2raw.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl;inc;xsd" -# End Group -# End Target -# End Project diff -Nru libwps-0.4.7/build/win32/wks2raw.vcproj libwps-0.4.8/build/win32/wks2raw.vcproj --- libwps-0.4.7/build/win32/wks2raw.vcproj 2015-02-03 19:25:32.000000000 +0000 +++ libwps-0.4.8/build/win32/wks2raw.vcproj 1970-01-01 00:00:00.000000000 +0000 @@ -1,235 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libwps-0.4.7/build/win32/wks2raw.vcxproj libwps-0.4.8/build/win32/wks2raw.vcxproj --- libwps-0.4.7/build/win32/wks2raw.vcxproj 2015-02-03 19:25:32.000000000 +0000 +++ libwps-0.4.8/build/win32/wks2raw.vcxproj 1970-01-01 00:00:00.000000000 +0000 @@ -1,148 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {0E6CBB23-DFDC-4194-A2CC-F030F6B7D730} - - - - Application - false - - - Application - false - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - .\Debug\ - .\Debug\ - true - .\Release\ - .\Release\ - false - - - - true - Win32 - .\Debug/wks2raw.tlb - - - - - Disabled - ..\..\inc;$(LIBREVENGE_INCLUDE_DIR);%(AdditionalIncludeDirectories) - _DEBUG;DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - .\Debug/wks2raw.pch - .\Debug/ - .\Debug/ - .\Debug/ - Level3 - true - EditAndContinue - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - libwps-0.3.lib;librevenge-stream-0.0.lib;librevenge-0.0.lib;%(AdditionalDependencies) - Debug\bin\wks2raw.exe - true - Debug\lib;$(LIBREVENGE_LIB_DIR);%(AdditionalLibraryDirectories) - true - .\Debug/wks2raw.pdb - Console - false - - - - - true - .\Debug/wks2raw.bsc - - - - - true - Win32 - .\Release/wks2raw.tlb - - - - - Disabled - ..\..\inc;$(LIBREVENGE_INCLUDE_DIR);%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - .\Release/wks2raw.pch - .\Release/ - .\Release/ - .\Release/ - Level3 - true - false - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - librevenge-stream-0.0.lib;libwps-0.3.lib;librevenge-0.0.lib;%(AdditionalDependencies) - Release\bin\wks2raw.exe - true - Release\lib;$(LIBREVENGE_LIB_DIR);%(AdditionalLibraryDirectories) - .\Release/wks2raw.pdb - Console - false - - - - - true - .\Release/wks2raw.bsc - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - - - {c24d5976-7da0-4b1e-838f-6adcc835b5e1} - false - - - - - - diff -Nru libwps-0.4.7/build/win32/wks2text.dsp libwps-0.4.8/build/win32/wks2text.dsp --- libwps-0.4.7/build/win32/wks2text.dsp 2015-02-03 19:25:32.000000000 +0000 +++ libwps-0.4.8/build/win32/wks2text.dsp 1970-01-01 00:00:00.000000000 +0000 @@ -1,106 +0,0 @@ -# Microsoft Developer Studio Project File - Name="wks2csv" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=wks2text - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "wks2text.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "wks2text.mak" CFG="wks2text - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "wks2text - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "wks2text - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "wks2text - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -MTL=midl.exe -# ADD BASE MTL /nologo /win32 -# ADD MTL /nologo /win32 -# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\src\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c -# ADD CPP /nologo /MT /W3 /GX /I "..\..\src\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 librevenge-stream-0.0.lib libwps-0.3.lib librevenge-0.0.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\wks2text.exe" /libpath:"Release\lib" -# ADD LINK32 librevenge-stream-0.0.lib libwps-0.3.lib librevenge-0.0.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\wks2text.exe" /libpath:"Release\lib" -# SUBTRACT LINK32 /nodefaultlib - -!ELSEIF "$(CFG)" == "wks2text - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -MTL=midl.exe -# ADD BASE MTL /nologo /win32 -# ADD MTL /nologo /win32 -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\src\lib" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c -# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\src\lib" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 libwps-0.3.lib librevenge-stream-0.0.lib librevenge-0.0.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\wks2text.exe" /libpath:"Debug\lib" -# ADD LINK32 libwps-0.3.lib librevenge-stream-0.0.lib librevenge-0.0.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\wks2text.exe" /libpath:"Debug\lib" -# SUBTRACT LINK32 /nodefaultlib - -!ENDIF - -# Begin Target - -# Name "wks2text - Win32 Release" -# Name "wks2text - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" -# Begin Source File - -SOURCE=..\..\src\conv\wks2text\wks2text.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl;inc;xsd" -# End Group -# End Target -# End Project diff -Nru libwps-0.4.7/build/win32/wks2text.vcproj libwps-0.4.8/build/win32/wks2text.vcproj --- libwps-0.4.7/build/win32/wks2text.vcproj 2015-02-03 19:25:32.000000000 +0000 +++ libwps-0.4.8/build/win32/wks2text.vcproj 1970-01-01 00:00:00.000000000 +0000 @@ -1,235 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libwps-0.4.7/build/win32/wks2text.vcxproj libwps-0.4.8/build/win32/wks2text.vcxproj --- libwps-0.4.7/build/win32/wks2text.vcxproj 2015-02-03 19:25:32.000000000 +0000 +++ libwps-0.4.8/build/win32/wks2text.vcxproj 1970-01-01 00:00:00.000000000 +0000 @@ -1,148 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {0E6CBB23-DFDC-4194-A2CC-F030F6B7D730} - - - - Application - false - - - Application - false - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - .\Debug\ - .\Debug\ - true - .\Release\ - .\Release\ - false - - - - true - Win32 - .\Debug/wks2text.tlb - - - - - Disabled - ..\..\inc;$(LIBREVENGE_INCLUDE_DIR);%(AdditionalIncludeDirectories) - _DEBUG;DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - .\Debug/wks2text.pch - .\Debug/ - .\Debug/ - .\Debug/ - Level3 - true - EditAndContinue - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - libwps-0.3.lib;librevenge-stream-0.0.lib;librevenge-0.0.lib;%(AdditionalDependencies) - Debug\bin\wks2text.exe - true - Debug\lib;$(LIBREVENGE_LIB_DIR);%(AdditionalLibraryDirectories) - true - .\Debug/wks2text.pdb - Console - false - - - - - true - .\Debug/wks2text.bsc - - - - - true - Win32 - .\Release/wks2text.tlb - - - - - Disabled - ..\..\inc;$(LIBREVENGE_INCLUDE_DIR);%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - .\Release/wks2text.pch - .\Release/ - .\Release/ - .\Release/ - Level3 - true - false - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - librevenge-stream-0.0.lib;libwps-0.3.lib;librevenge-0.0.lib;%(AdditionalDependencies) - Release\bin\wks2text.exe - true - Release\lib;$(LIBREVENGE_LIB_DIR);%(AdditionalLibraryDirectories) - .\Release/wks2text.pdb - Console - false - - - - - true - .\Release/wks2text.bsc - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - - - {c24d5976-7da0-4b1e-838f-6adcc835b5e1} - false - - - - - - diff -Nru libwps-0.4.7/build/win32/wps2html.dsp libwps-0.4.8/build/win32/wps2html.dsp --- libwps-0.4.7/build/win32/wps2html.dsp 2015-02-03 19:25:32.000000000 +0000 +++ libwps-0.4.8/build/win32/wps2html.dsp 1970-01-01 00:00:00.000000000 +0000 @@ -1,106 +0,0 @@ -# Microsoft Developer Studio Project File - Name="wps2html" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=wps2html - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "wps2html.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "wps2html.mak" CFG="wps2html - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "wps2html - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "wps2html - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "wps2html - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -MTL=midl.exe -# ADD BASE MTL /nologo /win32 -# ADD MTL /nologo /win32 -# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\src\lib" /I "librevenge-0.0" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c -# ADD CPP /nologo /MT /W3 /GX /I "..\..\src\lib" /I "librevenge-0.0" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 librevenge-stream-0.0.lib libwps-0.3.lib librevenge-0.0.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\wps2html.exe" /libpath:"Release\lib" -# ADD LINK32 librevenge-stream-0.0.lib libwps-0.3.lib librevenge-0.0.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\wps2html.exe" /libpath:"Release\lib" -# SUBTRACT LINK32 /nodefaultlib - -!ELSEIF "$(CFG)" == "wps2html - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -MTL=midl.exe -# ADD BASE MTL /nologo /win32 -# ADD MTL /nologo /win32 -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\src\lib" /I "librevenge-0.0" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c -# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\src\lib" /I "librevenge-0.0" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 librevenge-stream-0.0.lib libwps-0.3.lib librevenge-0.0.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\wps2html.exe" /libpath:"Debug\lib" -# ADD LINK32 libwps-0.3.lib librevenge-stream-0.0.lib librevenge-0.0.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\wps2html.exe" /libpath:"Debug\lib" -# SUBTRACT LINK32 /nodefaultlib - -!ENDIF - -# Begin Target - -# Name "wps2html - Win32 Release" -# Name "wps2html - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" -# Begin Source File - -SOURCE=..\..\src\conv\html\wps2html.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl;inc;xsd" -# End Group -# End Target -# End Project diff -Nru libwps-0.4.7/build/win32/wps2html.vcproj libwps-0.4.8/build/win32/wps2html.vcproj --- libwps-0.4.7/build/win32/wps2html.vcproj 2015-02-03 19:25:32.000000000 +0000 +++ libwps-0.4.8/build/win32/wps2html.vcproj 1970-01-01 00:00:00.000000000 +0000 @@ -1,235 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libwps-0.4.7/build/win32/wps2html.vcxproj libwps-0.4.8/build/win32/wps2html.vcxproj --- libwps-0.4.7/build/win32/wps2html.vcxproj 2015-02-03 19:25:32.000000000 +0000 +++ libwps-0.4.8/build/win32/wps2html.vcxproj 1970-01-01 00:00:00.000000000 +0000 @@ -1,148 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {D6B45938-C154-436B-AA28-29C35A8A691F} - - - - Application - false - - - Application - false - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - .\Debug\ - .\Debug\ - true - .\Release\ - .\Release\ - false - - - - true - Win32 - .\Debug/wps2html.tlb - - - - - Disabled - ..\..\inc;$(LIBREVENGE_INCLUDE_DIR);%(AdditionalIncludeDirectories) - _DEBUG;DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - .\Debug/wps2html.pch - .\Debug/ - .\Debug/ - .\Debug/ - Level3 - true - EditAndContinue - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - libwps-0.3.lib;librevenge-stream-0.0.lib;librevenge-0.0.lib;%(AdditionalDependencies) - Debug\bin\wps2html.exe - true - Debug\lib;$(LIBREVENGE_LIB_DIR);%(AdditionalLibraryDirectories) - true - .\Debug/wps2html.pdb - Console - false - - - - - true - .\Debug/wps2html.bsc - - - - - true - Win32 - .\Release/wps2html.tlb - - - - - Disabled - ..\..\inc;$(LIBREVENGE_INCLUDE_DIR);%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - .\Release/wps2html.pch - .\Release/ - .\Release/ - .\Release/ - Level3 - true - false - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - librevenge-stream-0.0.lib;libwps-0.3.lib;librevenge-0.0.lib;%(AdditionalDependencies) - Release\bin\wps2html.exe - true - Release\lib;$(LIBREVENGE_LIB_DIR);%(AdditionalLibraryDirectories) - .\Release/wps2html.pdb - Console - false - - - - - true - .\Release/wps2html.bsc - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - - - {c24d5976-7da0-4b1e-838f-6adcc835b5e1} - false - - - - - - diff -Nru libwps-0.4.7/build/win32/wps2raw.dsp libwps-0.4.8/build/win32/wps2raw.dsp --- libwps-0.4.7/build/win32/wps2raw.dsp 2015-02-03 19:25:32.000000000 +0000 +++ libwps-0.4.8/build/win32/wps2raw.dsp 1970-01-01 00:00:00.000000000 +0000 @@ -1,106 +0,0 @@ -# Microsoft Developer Studio Project File - Name="wps2raw" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=wps2raw - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "wps2raw.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "wps2raw.mak" CFG="wps2raw - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "wps2raw - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "wps2raw - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "wps2raw - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -MTL=midl.exe -# ADD BASE MTL /nologo /win32 -# ADD MTL /nologo /win32 -# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\src\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c -# ADD CPP /nologo /MT /W3 /GX /I "..\..\src\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 librevenge-stream-0.0.lib libwps-0.3.lib librevenge-0.0.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\wps2raw.exe" /libpath:"Release\lib" -# ADD LINK32 librevenge-stream-0.0.lib libwps-0.3.lib librevenge-0.0.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\wps2raw.exe" /libpath:"Release\lib" -# SUBTRACT LINK32 /nodefaultlib - -!ELSEIF "$(CFG)" == "wps2raw - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -MTL=midl.exe -# ADD BASE MTL /nologo /win32 -# ADD MTL /nologo /win32 -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\src\lib" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c -# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\src\lib" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 libwps-0.3.lib librevenge-stream-0.0.lib librevenge-0.0.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\wps2raw.exe" /libpath:"Debug\lib" -# ADD LINK32 libwps-0.3.lib librevenge-stream-0.0.lib librevenge-0.0.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\wps2raw.exe" /libpath:"Debug\lib" -# SUBTRACT LINK32 /nodefaultlib - -!ENDIF - -# Begin Target - -# Name "wps2raw - Win32 Release" -# Name "wps2raw - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" -# Begin Source File - -SOURCE=..\..\src\conv\raw\wps2raw.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl;inc;xsd" -# End Group -# End Target -# End Project diff -Nru libwps-0.4.7/build/win32/wps2raw.vcproj libwps-0.4.8/build/win32/wps2raw.vcproj --- libwps-0.4.7/build/win32/wps2raw.vcproj 2015-02-03 19:25:32.000000000 +0000 +++ libwps-0.4.8/build/win32/wps2raw.vcproj 1970-01-01 00:00:00.000000000 +0000 @@ -1,235 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libwps-0.4.7/build/win32/wps2raw.vcxproj libwps-0.4.8/build/win32/wps2raw.vcxproj --- libwps-0.4.7/build/win32/wps2raw.vcxproj 2015-02-03 19:25:32.000000000 +0000 +++ libwps-0.4.8/build/win32/wps2raw.vcxproj 1970-01-01 00:00:00.000000000 +0000 @@ -1,148 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {0E6CBB23-DFDC-4194-A2CC-F030F6B7D730} - - - - Application - false - - - Application - false - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - .\Debug\ - .\Debug\ - true - .\Release\ - .\Release\ - false - - - - true - Win32 - .\Debug/wps2raw.tlb - - - - - Disabled - ..\..\inc;$(LIBREVENGE_INCLUDE_DIR);%(AdditionalIncludeDirectories) - _DEBUG;DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - .\Debug/wps2raw.pch - .\Debug/ - .\Debug/ - .\Debug/ - Level3 - true - EditAndContinue - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - libwps-0.3.lib;librevenge-stream-0.0.lib;librevenge-0.0.lib;%(AdditionalDependencies) - Debug\bin\wps2raw.exe - true - Debug\lib;$(LIBREVENGE_LIB_DIR);%(AdditionalLibraryDirectories) - true - .\Debug/wps2raw.pdb - Console - false - - - - - true - .\Debug/wps2raw.bsc - - - - - true - Win32 - .\Release/wps2raw.tlb - - - - - Disabled - ..\..\inc;$(LIBREVENGE_INCLUDE_DIR);%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - .\Release/wps2raw.pch - .\Release/ - .\Release/ - .\Release/ - Level3 - true - false - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - librevenge-stream-0.0.lib;libwps-0.3.lib;librevenge-0.0.lib;%(AdditionalDependencies) - Release\bin\wps2raw.exe - true - Release\lib;$(LIBREVENGE_LIB_DIR);%(AdditionalLibraryDirectories) - .\Release/wps2raw.pdb - Console - false - - - - - true - .\Release/wps2raw.bsc - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - - - {c24d5976-7da0-4b1e-838f-6adcc835b5e1} - false - - - - - - diff -Nru libwps-0.4.7/build/win32/wps2text.dsp libwps-0.4.8/build/win32/wps2text.dsp --- libwps-0.4.7/build/win32/wps2text.dsp 2015-02-03 19:25:32.000000000 +0000 +++ libwps-0.4.8/build/win32/wps2text.dsp 1970-01-01 00:00:00.000000000 +0000 @@ -1,106 +0,0 @@ -# Microsoft Developer Studio Project File - Name="wps2text" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=wps2text - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "wps2text.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "wps2text.mak" CFG="wps2text - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "wps2text - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "wps2text - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "wps2text - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -MTL=midl.exe -# ADD BASE MTL /nologo /win32 -# ADD MTL /nologo /win32 -# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\src\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c -# ADD CPP /nologo /MT /W3 /GX /I "..\..\src\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 librevenge-stream-0.0.lib libwps-0.3.lib librevenge-0.0.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\wps2text.exe" /libpath:"Release\lib" -# ADD LINK32 librevenge-stream-0.0.lib libwps-0.3.lib librevenge-0.0.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\wps2text.exe" /libpath:"Release\lib" -# SUBTRACT LINK32 /nodefaultlib - -!ELSEIF "$(CFG)" == "wps2text - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -MTL=midl.exe -# ADD BASE MTL /nologo /win32 -# ADD MTL /nologo /win32 -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "\..\..\src\lib " /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c -# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\src\lib" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 libwps-0.3.lib librevenge-stream-0.0.lib librevenge-0.0.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\wps2text.exe" /libpath:"Debug\lib" -# ADD LINK32 libwps-0.3.lib librevenge-stream-0.0.lib librevenge-0.0.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\wps2text.exe" /libpath:"Debug\lib" -# SUBTRACT LINK32 /nodefaultlib - -!ENDIF - -# Begin Target - -# Name "wps2text - Win32 Release" -# Name "wps2text - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" -# Begin Source File - -SOURCE=..\..\src\conv\text\wps2text.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl;inc;xsd" -# End Group -# End Target -# End Project diff -Nru libwps-0.4.7/build/win32/wps2text.vcproj libwps-0.4.8/build/win32/wps2text.vcproj --- libwps-0.4.7/build/win32/wps2text.vcproj 2015-02-03 19:25:32.000000000 +0000 +++ libwps-0.4.8/build/win32/wps2text.vcproj 1970-01-01 00:00:00.000000000 +0000 @@ -1,235 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libwps-0.4.7/build/win32/wps2text.vcxproj libwps-0.4.8/build/win32/wps2text.vcxproj --- libwps-0.4.7/build/win32/wps2text.vcxproj 2015-02-03 19:25:32.000000000 +0000 +++ libwps-0.4.8/build/win32/wps2text.vcxproj 1970-01-01 00:00:00.000000000 +0000 @@ -1,148 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {FCB2AC04-1AE5-4E43-A80B-BBAA9FA00F5A} - - - - Application - false - - - Application - false - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - .\Debug\ - .\Debug\ - true - .\Release\ - .\Release\ - false - - - - true - Win32 - .\Debug/wps2text.tlb - - - - - Disabled - ..\..\inc;$(LIBREVENGE_INCLUDE_DIR);%(AdditionalIncludeDirectories) - _DEBUG;DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - .\Debug/wps2text.pch - .\Debug/ - .\Debug/ - .\Debug/ - Level3 - true - EditAndContinue - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - libwps-0.3.lib;librevenge-stream-0.0.lib;librevenge-0.0.lib;%(AdditionalDependencies) - Debug\bin\wps2text.exe - true - Debug\lib;$(LIBREVENGE_LIB_DIR);%(AdditionalLibraryDirectories) - true - .\Debug/wps2text.pdb - Console - false - - - - - true - .\Debug/wps2text.bsc - - - - - true - Win32 - .\Release/wps2text.tlb - - - - - Disabled - ..\..\inc;$(LIBREVENGE_INCLUDE_DIR);%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - .\Release/wps2text.pch - .\Release/ - .\Release/ - .\Release/ - Level3 - true - false - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - librevenge-stream-0.0.lib;libwps-0.3.lib;librevenge-0.0.lib;%(AdditionalDependencies) - Release\bin\wps2text.exe - true - Release\lib;$(LIBREVENGE_LIB_DIR);%(AdditionalLibraryDirectories) - .\Release/wps2text.pdb - Console - false - - - - - true - .\Release/wps2text.bsc - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - - - {c24d5976-7da0-4b1e-838f-6adcc835b5e1} - false - - - - - - diff -Nru libwps-0.4.7/ChangeLog libwps-0.4.8/ChangeLog --- libwps-0.4.7/ChangeLog 2017-07-16 08:06:11.000000000 +0000 +++ libwps-0.4.8/ChangeLog 2017-11-23 13:25:44.000000000 +0000 @@ -1,3 +1,473 @@ +2017-11-23 osnola [5b31a316231e7aa95281e54f6779c036e99ed81e] + +tupdate readme files... + + +2017-11-17 David Tardon [63d0bdc4d0d3b5ebd99a4a58b7f4edfc3c8867ef] + +tofz#1811 avoid big memory allocation + +tChange the check added by commit 00709e53a777775a9bcfcb90599e49ed1ff2a1fd +tto what was likely intended. + +2017-11-15 osnola [80008d3362a2ec1e56120bee9c1d332358582444] + +tautogen.sh: fix creation of configure + + +2017-11-14 osnola [1b056d30bc51dc21352d2dab32dde0fbdc7d2691] + +tsrc/conv/*/Makefile.am: uses $(top_srcdir) to find src/conv/helper... + + +2017-11-14 osnola [f2a0a4fc2d48a99ebb8454dcf6ff36690e5a586e] + +tcppcheck: pass more arguments by reference... + + +2017-11-14 osnola [e86df755812a620821ba5963adf5ff3cfea9a2a8] + +tcppcheck: add some explicit keywords... + + +2017-11-14 osnola [3ac702953769a0ccdbab4953962abd36c196c67f] + +tMerge branch 'master' of ssh://git.code.sf.net/p/libwps/code + + +2017-11-14 osnola [46d00e2a8bf925d900fe9b0f99ffff703253dab0] + +tcoverity: correct some warnings/problems... + + +2017-11-02 Miklos Vajna [453f6270365fdfb411ab33f1f084045ec8f05ca2] + +tUse auto when declaring iterators and when initializing with a cast + + +2017-10-28 David Tardon [038f1813579009c30ffb226048d669ee89634199] + +tdrop MSVC project files obsoleted by move to C++11 + + +2017-10-25 osnola [7aa7bbc568d89e69a9656f7f7ac0de0f39c5d28a] + +tWKSChart.cpp: do no escapeXML chart:label-string here, it will escape later... LotusChart.cpp: astyle change... + + +2017-10-24 osnola [ea74822902e74931496a082ff84b4b3b49afc82b] + +tLotus*: try to retrieve some .wk4's charts... + + +2017-10-20 osnola [0a3cb82a299af0fd3196b48b70f55e2d09c2df36] + +tLotus*cpp: try to retrieve some Dos/Windows's .wk3 charts, to be improved... + + +2017-10-17 osnola [acf436e216c1a73fd4e1b6d095bdde8a42f4f1ad] + +tQuattro*[wb2]: - try to retrieve the OLE's pictures, - accept to convert such file in non-debug mode WPSOLEParser.{h,cpp}: - allow to associate a stream name to an object id using a different method... + + +2017-10-14 osnola [6c29ccb0a90515cb2c19d53110ac03629f1fd1df] + +tWKSContentListener.{h,cpp}: add possiblity to have cell's list which refer to different spreadsheets... Quattro.{h,cpp}[wb2]: begin to parse some new zones', to be continued... + + +2017-10-13 osnola [03ea76e6603d042d49e1f341dbcbb6ccf45d7ca7] + +tWPSOLEStream.{h,cpp}: the return + this old class will be needed to parse .wb2 files which contain the "classic" spreadsheet's data and can also contain an OLE file (to store the different OLEs). + + +2017-10-12 osnola [879bdf4b8be4077814ad7ae6eb7b05c4da75c9ad] + +tQuattro*[wb1]: try to retrieve the different OLEs' + retrieve the button's labels in a textbox(very basic). + + +2017-10-11 osnola [7b43d50371611dfa1cc9efc5155722ddb02ec90a] + +tWPSOLEParser: use WPSEmbeddedObject to store the pictures... + + +2017-10-11 osnola [f94f9d70dd49de6882628cdf26df53901d7bc587] + +tWPS4Graph.{h,cpp}: use WPSOLEObject to read the internal OLE data, WPSOLEParser.{h,cpp}: returns the list of read OLE as map... + + +2017-10-10 osnola [25d8528a349903cdb99a516c1ff0ba936251a725] + +tWPSOLEObject: add a class to regroup the reading of "Ole" object... + + +2017-10-09 osnola [bd369dd2439b61f3f35d8b9577c6f87eaf0cde7d] + +tQuattroGraph.{h,cpp}: add a file to parse/retrieve Quattro wb1 graphic, + begin to parse the buttons' and the OLEs' zones, to be continued, Quattro*.{h,cpp}: change code to read zones with size>0xFF00, + + +2017-10-08 David Tardon [a5e334c1e62baf34575499e26e61c7cc9d12299e] + +tavoid explicit delete + + +2017-10-08 David Tardon [48cd2643425f674c44af7e4e1c17123a5cf3f114] + +tno need for virtual dtor here + + +2017-10-08 David Tardon [c2cfd8637b490107a9f0b7367a367cef46608b7a] + +tavoid naked pointer + + +2017-10-08 David Tardon [9c0c7598f6a6dd8400474ecc4a148a421f1d413d] + +tnitpick + + +2017-10-08 David Tardon [9d09023467ececf38c388de47614150ee39d988f] + +tofz#3352 ensure the size of data to read is >0 + + +2017-10-08 David Tardon [2cf05647f7c8544fca171d375b198dbe4658cc8e] + +tavoid int overflow when parsing row + + +2017-10-08 David Tardon [b479863157c887d71ba81a8dbd06f5e4ceac44c0] + +tofz#3588 avoid int overflow when parsing column + + +2017-10-07 osnola [35c1ee0c5145957fdf830990dfe121716cc32ebb] + +tQuattro*[wb1]: try to recover the field's references and the user formattings(basic)... + + +2017-10-06 David Tardon [34adff68702839fd594f0a1aefc05732f48ae049] + +tofz#3562 fix OOB read from array + + +2017-10-05 osnola [3eba0a01c941c989b28c680eedfab98948a1de7c] + +tQuattro.cpp[.wb1]: add code to retrieve - the sheet's names, - file external references(basic) - centering across cells(some kind of merging). + + +2017-10-04 osnola [f194eb7e695b4055a5c0e912cb1de119a95d06ea] + +tQuattro*: add support for .wb1 files trying to retrieve the cells' styles, the columns' width, the row heights, + add code to read the encrypted files. + + +2017-10-01 osnola [8d3841566390fa0b1c56eface42d3e8c8be80037] + +tLotusChart: try to retrieve wks3(mac) charts, + begin to store the parsing of wks3(pc) and wks4 charts, to be continued... WKSChart: change code to retrieve more data... + + +2017-09-28 David Tardon [4bf54fee3de0a8e7b86a756f267fc35d73bcb5cb] + +tavoid output from fuzzers + + +2017-09-27 osnola [024f27f205adf628fdfc65740b199a51929ebb56] + +tofz#3446: correct out of bounds problem... + + +2017-09-27 David Tardon [0da9b7ea54f167d0b732601cb146c331e22e6521] + +tavoid possible null pointer dereference + + +2017-09-27 David Tardon [d73d8a75e1d6bf622555c93599b81b6eebfde363] + +tofz#3333 fix null ptr dereference + + +2017-09-26 Miklos Vajna [883e6c375352975f7cc7719a25d655d51fda4b16] + +tConvert explicit for loops to range-based ones where possible + +tThis is most useful at places where the original loop end condition was a +tduplicate of the size of an array. + +2017-09-25 Miklos Vajna [fa7c60f35ee942788d776ad249644c00bcf54ad6] + +tConvert 0 to nullptr where it's used as a pointer value + +tTo make the code easier to read, because this means the remaining zeros +tall mean numbers. + +2017-09-24 Miklos Vajna [bc16603ade6c6d6ba7539ca7b671f661f46c1163] + +tMark overriding member functions as 'override' + +tThis does not affect the generated code (API or ABI), but: + +t1) Makes sure that in case the signature of one of these functions would +tchange by accident, the build breaks as the function no longer overrides +ta base function. + +t2) Makes the code readable by explicitly marking all overriding +tfunctions as 'override', where previously the reader had to read the +tinterface of the base class(es) as well to find out if the function is +tvirtual or not. + +t3) Since 'override' implies 'virtual', remove the 'virtual' keyword +twhere 'override' is present. + +2017-09-24 osnola [51fc8a2645bed492fd92c344d0b94588c6545552] + +tMerge branch 'master' of ssh://git.code.sf.net/p/libwps/code + + +2017-09-24 osnola [caf98e3345a5535f63b084449a658915243f5439] + +tLotusChart.{h,cpp}: add a file to parse/retrieve chart structures, ... - move .wk3 and .wk4 chart's functions in this file, - begin to parse these structures, to be continued... + + +2017-09-22 Miklos Vajna [c66a51b71d772b1da83ef8d87a155d41f5f5a12e] + +tWKSChart: comparison of unsigned enum expression >= 0 is always true + + +2017-09-21 Miklos Vajna [97b7b40caf697e4f6ba62af38cdf4008e2b7bf75] + +tWKS4: fix gcc-4.8 -Wshadow warning + +tWKS4.cpp: In member function 'bool WKS4Parser::checkHeader(WPSHeader*, bool)': +tWKS4.cpp:445:7: error: declaration of 'creator' shadows a member of 'this' [-Werror=shadow] +t auto creator=libwps::WPS_MSWORKS; +t ^ + +2017-09-21 Miklos Vajna [9836ec5dd09c508972d0f093f3900e3a2f2b68a9] + +tFix gcc-4.8 build by adding missing include + +thelper.cpp: In function 'void libwpsHelper::printDebugMsg(const char*, ...)': +thelper.cpp:60:23: error: 'va_start' was not declared in this scope +t va_start(args, format); +t ^ +thelper.cpp:62:13: error: 'va_end' was not declared in this scope +t va_end(args); +t ^ + +2017-09-19 osnola [fd01a9bf8b7bc7ff6e6c75045954bf3c9d45d21d] + +tWKS4*: try to retrieve chart's in MsWorks 3.0 files... + + +2017-09-16 osnola [97b97b5c86774834fa53c1053a18ba7db00851d5] + +tWKSChart: add code to define the "point" style... WKS4: begin to retrieve the window's wks style, to be continued... + + +2017-09-13 osnola [c6ea4178e8d5bdd9c6185618d61969f91f267123] + +tQuattro*: add preliminary files to parse wb1 and wb2 files (only activated in debug mode). + + +2017-09-11 David Tardon [c8abf491c0330a04655336c24261c3f9d815ecd7] + +tWaE: declaration of 'path' shadows a member of 'this' + + +2017-09-11 David Tardon [16d85bab358ccf47a79210b54e8998e605d41151] + +tWaE: unused parameter + + +2017-09-08 osnola [863af2c0dc721f9e077ee46fdb0f1b053ac1479a] + +trename Quattro* in QuattroDos*... + + +2017-09-08 osnola [e4ba1787e8a699b0d7946aea4edc82df6812888c] + +tWKS4*: try to retrieve chart in Lotus' wk1 files... + + +2017-09-07 osnola [9e522967285e5c3fb5a0de114cd877ea589ba27c] + +tWKS4*: try to recover chart in Dos MsWorks' spreadsheet files... + + +2017-09-05 osnola [fc6d13400d121eb7570c8c7bf5005db067abea5a] + +tWKS4Chart.{h,cpp}: finish to move chart's code in this file + try to parse the different fields, to be continued... + + +2017-09-03 osnola [1e6513a3c1ec149fd80aed5c317f7f43a8389fed] + +tWKS4Chart.{h,cpp}: add a file to parse chart data, to be continued... WKS4*: try to simplify a little the code... + + +2017-09-02 osnola [54d8bc9bdf9fa67bea6e3dc175c07e48610490b6] + +tQuattroDos: try to improve the chart's style... + + +2017-09-01 osnola [338418cdaaa4c08fd95a132799c3a4e222e3bec3] + +tQuattro Pro: begin to recover some charts, must be improved... + + +2017-08-30 osnola [0836fefbad4924da1b39a1192420a3bd82478cd9] + +tWKSChart*: add a class to store/retrieve chart data, WPSPosition*: add a cell's anchor, WKSContentListener*: allow to insert a chart, QuattroDosChart.*: begin to read the chart's data, to be continue... + + +2017-08-08 osnola [5f5cce68039facb807fa6b845446318a588561c1] + +tsrc/conv/*/*: try to simplify the code... + + +2017-08-08 osnola [837d47d04992dfcd92f1ed05ae5b8dc3637386f2] + +tWPST*: try to simplify the code... + + +2017-08-08 osnola [8406fdfbf41962ed1ce07190b9d2d1a5229b6b4c] + +tWPSS*: try to simplify the code... + + +2017-08-08 osnola [a2b8ccbc38f36f1b5b1353068a8c2c00ab943882] + +tWPSP*: try to simplify the code... + + +2017-08-08 osnola [a93d45a06151a745f26b6e4e3e8724d1513dedca] + +tWPSO*: try to simplify the code... + + +2017-08-08 osnola [ca5c16f90d87183c78a9659bca43764fc1506960] + +tWPS[HL]*: try to simplify the code... + + +2017-08-08 osnola [73c01690a12adbc57ae513fde4c873ef4211ac4e] + +tWPS[E-G]*.* : try to simplify the code... + + +2017-08-08 osnola [080f1d4e54bffcc0e25eed4f44686392d929caa1] + +tWPSDebug*: try to simplify the code... + + +2017-08-08 osnola [2ca7425ef9a6d8e85d94b9eeca5c49a9feb90117] + +tWPSC*: try to simplify the code... + + +2017-08-07 osnola [8d0b45a22455447cc7a4d857cbc2591d39226ec6] + +tWPS8*.*: try to simplify the code... + + +2017-08-07 osnola [1ec2d12c5ce407b5d7a5e48115324b23daeb67a4] + +tWPS8.*: try to simplify the code... + + +2017-08-07 osnola [e776eae3a54e9bb48c6eef7173277aeb0d24bda1] + +tWPS4*: try to simplify the code... + + +2017-08-07 osnola [e41d8176a3b76a368ddf635d6ad863e20c42bbb9] + +tWKS*.*: try to simplify the code... + + +2017-08-07 osnola [0130b255cd19543c176d988c23e00c19fb471312] + +tWKSContentListener.*: try to simplify the code... + + +2017-08-07 osnola [2b6179f78a7c34eec81f11f33c6898ab80dd9d16] + +tWKS4*.*: try to simplify the code... + + +2017-08-07 osnola [96e3ceb6f5bb63b485b19aef84545270cb886396] + +tQuattro*.*: try to simplify the code... + + +2017-08-07 osnola [f41768a7df4fc3959581697e5373c20fce232f50] + +tMSWrite.*: try to simplify the code... + + +2017-08-07 osnola [c9955440c16a12d8db858469c4b2dea4a0c146a5] + +tLotus.*: try to simplify the code... + + +2017-08-07 osnola [6f1c0987d8101fc8132974d6e36e358a5d09e665] + +tDosWord.*: try to simplify the code... + + +2017-08-06 osnola [953902aa9c4296910a66faf78a7ea0f192906d47] + +tlibwps_internal.*: try to simplify the code... + + +2017-08-06 osnola [ae6efc52ac12c5f2def112f93a353d66c5bc1f6e] + +tlibwps_internal.h: try to simplify the code... + + +2017-08-06 osnola [d495497512c60114cfff9dde78d3db469211b67f] + +tall: test format's attribute in configure.ac + + +2017-08-06 osnola [c09ff73d0e8396b6ca55eefa81d047c3d33e0943] + +tWKSContentListener.cpp: send row/column positions in formula as int... + + +2017-07-30 osnola [00eaac00880905a0c058c3f2fc285216fe4731e6] + +tm4/dlp_fallthrough: replace clang:fallthrough by clang::fallthrough... + + +2017-07-30 David Tardon [e9248f15869ddc876f4194e26899b8c8dc92e634] + +tinclude m4 files for C++11 check + + +2017-07-30 David Tardon [0b14be00dce19c18a993ad843b337fb3dcbd1e39] + +tmove detection of fallthrough attribute to configure + + +2017-07-30 David Tardon [37c8b6b2b566d63149fc14f66e47808013b275a8] + +tignore only auto-generated m4 files + + +2017-07-26 osnola [07dbc3565a10ba5c70785b51a55605666c81d67a] + +tall: replace XXX::shared_ptr by std::shared_ptr + configure.ac: add AX_CXX_COMPILE_STDCXX_11 + + +2017-07-19 osnola [e97fbd242bf96c7952b277d7cbdd99262077794b] + +tclang: do not assume that we can use defined(__has_cpp_attribute) and __has_cpp_attribute(clang::fallthrough) on the same line... + + +2017-07-16 osnola [b980bfbd4a5a0f27eeb235a97f887df78d95df91] + +tconfigure.ac: update micro version... + + 2017-07-16 osnola [b992069290a4c107bb424ef421ee82ba2ae31357] tconfigure.ac: update micro version diff -Nru libwps-0.4.7/config.h.in libwps-0.4.8/config.h.in --- libwps-0.4.7/config.h.in 2017-07-16 08:06:08.000000000 +0000 +++ libwps-0.4.8/config.h.in 2017-11-15 10:23:09.000000000 +0000 @@ -1,8 +1,20 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* Define to 1 if the system has the clang-style `fallthrough' attribute */ +#undef HAVE_CLANG_ATTRIBUTE_FALLTHROUGH + +/* define if the compiler supports basic C++11 syntax */ +#undef HAVE_CXX11 + /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H +/* Define to 1 if the system has the `format' function attribute */ +#undef HAVE_FUNC_ATTRIBUTE_FORMAT + +/* Define to 1 if the system has the GNU-style `fallthrough' attribute */ +#undef HAVE_GCC_ATTRIBUTE_FALLTHROUGH + /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H @@ -54,15 +66,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Use Boost implementation of shared_ptr */ -#undef SHAREDPTR_BOOST - -/* Use C++11 implementation of shared_ptr */ -#undef SHAREDPTR_STD - -/* Use TR1 implementation of shared_ptr */ -#undef SHAREDPTR_TR1 - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff -Nru libwps-0.4.7/configure libwps-0.4.8/configure --- libwps-0.4.7/configure 2017-07-16 08:05:53.000000000 +0000 +++ libwps-0.4.8/configure 2017-11-15 10:22:46.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libwps 0.4.7. +# Generated by GNU Autoconf 2.69 for libwps 0.4.8. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='libwps' PACKAGE_TARNAME='libwps' -PACKAGE_VERSION='0.4.7' -PACKAGE_STRING='libwps 0.4.7' +PACKAGE_VERSION='0.4.8' +PACKAGE_STRING='libwps 0.4.8' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -671,6 +671,7 @@ WPS_MICRO_VERSION WPS_MINOR_VERSION WPS_MAJOR_VERSION +HAVE_CXX11 PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG @@ -814,7 +815,6 @@ enable_debug enable_full_debug enable_static_tools -with_sharedptr with_docs enable_tools enable_fuzzers @@ -1382,7 +1382,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libwps 0.4.7 to adapt to many kinds of systems. +\`configure' configures libwps 0.4.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1452,7 +1452,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libwps 0.4.7:";; + short | recursive ) echo "Configuration of libwps 0.4.8:";; esac cat <<\_ACEOF @@ -1493,9 +1493,6 @@ --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot[=DIR] Search for dependent libraries within DIR (or the compiler's sysroot if not specified). - --with-sharedptr=boost|c++11|tr1 - Use Boost|std::memory|std::tr1::memory for shared - ptr implementation --without-docs Do not build documentation Some influential environment variables: @@ -1596,7 +1593,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libwps configure 0.4.7 +libwps configure 0.4.8 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1995,7 +1992,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libwps $as_me 0.4.7, which was +It was created by libwps $as_me 0.4.8, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2861,7 +2858,7 @@ # Define the identity of the package. PACKAGE='libwps' - VERSION='0.4.7' + VERSION='0.4.8' cat >>confdefs.h <<_ACEOF @@ -17153,6 +17150,1162 @@ fi fi + ax_cxx_compile_alternatives="11 0x" ax_cxx_compile_cxx11_required=true + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + ac_success=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features by default" >&5 +$as_echo_n "checking whether $CXX supports C++11 features by default... " >&6; } +if ${ax_cv_cxx_compile_cxx11+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +// If the compiler admits that it is not ready for C++11, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201103L + +#error "This is not a C++11 compiler" + +#else + +namespace cxx11 +{ + + namespace test_static_assert + { + + template + struct check + { + static_assert(sizeof(int) <= sizeof(T), "not big enough"); + }; + + } + + namespace test_final_override + { + + struct Base + { + virtual void f() {} + }; + + struct Derived : public Base + { + virtual void f() override {} + }; + + } + + namespace test_double_right_angle_brackets + { + + template < typename T > + struct check {}; + + typedef check single_type; + typedef check> double_type; + typedef check>> triple_type; + typedef check>>> quadruple_type; + + } + + namespace test_decltype + { + + int + f() + { + int a = 1; + decltype(a) b = 2; + return a + b; + } + + } + + namespace test_type_deduction + { + + template < typename T1, typename T2 > + struct is_same + { + static const bool value = false; + }; + + template < typename T > + struct is_same + { + static const bool value = true; + }; + + template < typename T1, typename T2 > + auto + add(T1 a1, T2 a2) -> decltype(a1 + a2) + { + return a1 + a2; + } + + int + test(const int c, volatile int v) + { + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == false, ""); + auto ac = c; + auto av = v; + auto sumi = ac + av + 'x'; + auto sumf = ac + av + 1.0; + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == true, ""); + return (sumf > 0.0) ? sumi : add(c, v); + } + + } + + namespace test_noexcept + { + + int f() { return 0; } + int g() noexcept { return 0; } + + static_assert(noexcept(f()) == false, ""); + static_assert(noexcept(g()) == true, ""); + + } + + namespace test_constexpr + { + + template < typename CharT > + unsigned long constexpr + strlen_c_r(const CharT *const s, const unsigned long acc) noexcept + { + return *s ? strlen_c_r(s + 1, acc + 1) : acc; + } + + template < typename CharT > + unsigned long constexpr + strlen_c(const CharT *const s) noexcept + { + return strlen_c_r(s, 0UL); + } + + static_assert(strlen_c("") == 0UL, ""); + static_assert(strlen_c("1") == 1UL, ""); + static_assert(strlen_c("example") == 7UL, ""); + static_assert(strlen_c("another\0example") == 7UL, ""); + + } + + namespace test_rvalue_references + { + + template < int N > + struct answer + { + static constexpr int value = N; + }; + + answer<1> f(int&) { return answer<1>(); } + answer<2> f(const int&) { return answer<2>(); } + answer<3> f(int&&) { return answer<3>(); } + + void + test() + { + int i = 0; + const int c = 0; + static_assert(decltype(f(i))::value == 1, ""); + static_assert(decltype(f(c))::value == 2, ""); + static_assert(decltype(f(0))::value == 3, ""); + } + + } + + namespace test_uniform_initialization + { + + struct test + { + static const int zero {}; + static const int one {1}; + }; + + static_assert(test::zero == 0, ""); + static_assert(test::one == 1, ""); + + } + + namespace test_lambdas + { + + void + test1() + { + auto lambda1 = [](){}; + auto lambda2 = lambda1; + lambda1(); + lambda2(); + } + + int + test2() + { + auto a = [](int i, int j){ return i + j; }(1, 2); + auto b = []() -> int { return '0'; }(); + auto c = [=](){ return a + b; }(); + auto d = [&](){ return c; }(); + auto e = [a, &b](int x) mutable { + const auto identity = [](int y){ return y; }; + for (auto i = 0; i < a; ++i) + a += b--; + return x + identity(a + b); + }(0); + return a + b + c + d + e; + } + + int + test3() + { + const auto nullary = [](){ return 0; }; + const auto unary = [](int x){ return x; }; + using nullary_t = decltype(nullary); + using unary_t = decltype(unary); + const auto higher1st = [](nullary_t f){ return f(); }; + const auto higher2nd = [unary](nullary_t f1){ + return [unary, f1](unary_t f2){ return f2(unary(f1())); }; + }; + return higher1st(nullary) + higher2nd(nullary)(unary); + } + + } + + namespace test_variadic_templates + { + + template + struct sum; + + template + struct sum + { + static constexpr auto value = N0 + sum::value; + }; + + template <> + struct sum<> + { + static constexpr auto value = 0; + }; + + static_assert(sum<>::value == 0, ""); + static_assert(sum<1>::value == 1, ""); + static_assert(sum<23>::value == 23, ""); + static_assert(sum<1, 2>::value == 3, ""); + static_assert(sum<5, 5, 11>::value == 21, ""); + static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); + + } + + // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae + // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function + // because of this. + namespace test_template_alias_sfinae + { + + struct foo {}; + + template + using member = typename T::member_type; + + template + void func(...) {} + + template + void func(member*) {} + + void test(); + + void test() { func(0); } + + } + +} // namespace cxx11 + +#endif // __cplusplus >= 201103L + + + +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ax_cv_cxx_compile_cxx11=yes +else + ax_cv_cxx_compile_cxx11=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx11" >&5 +$as_echo "$ax_cv_cxx_compile_cxx11" >&6; } + if test x$ax_cv_cxx_compile_cxx11 = xyes; then + ac_success=yes + fi + + if test x$ac_success = xno; then + for alternative in ${ax_cxx_compile_alternatives}; do + switch="-std=gnu++${alternative}" + cachevar=`$as_echo "ax_cv_cxx_compile_cxx11_$switch" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5 +$as_echo_n "checking whether $CXX supports C++11 features with $switch... " >&6; } +if eval \${$cachevar+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_CXX="$CXX" + CXX="$CXX $switch" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +// If the compiler admits that it is not ready for C++11, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201103L + +#error "This is not a C++11 compiler" + +#else + +namespace cxx11 +{ + + namespace test_static_assert + { + + template + struct check + { + static_assert(sizeof(int) <= sizeof(T), "not big enough"); + }; + + } + + namespace test_final_override + { + + struct Base + { + virtual void f() {} + }; + + struct Derived : public Base + { + virtual void f() override {} + }; + + } + + namespace test_double_right_angle_brackets + { + + template < typename T > + struct check {}; + + typedef check single_type; + typedef check> double_type; + typedef check>> triple_type; + typedef check>>> quadruple_type; + + } + + namespace test_decltype + { + + int + f() + { + int a = 1; + decltype(a) b = 2; + return a + b; + } + + } + + namespace test_type_deduction + { + + template < typename T1, typename T2 > + struct is_same + { + static const bool value = false; + }; + + template < typename T > + struct is_same + { + static const bool value = true; + }; + + template < typename T1, typename T2 > + auto + add(T1 a1, T2 a2) -> decltype(a1 + a2) + { + return a1 + a2; + } + + int + test(const int c, volatile int v) + { + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == false, ""); + auto ac = c; + auto av = v; + auto sumi = ac + av + 'x'; + auto sumf = ac + av + 1.0; + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == true, ""); + return (sumf > 0.0) ? sumi : add(c, v); + } + + } + + namespace test_noexcept + { + + int f() { return 0; } + int g() noexcept { return 0; } + + static_assert(noexcept(f()) == false, ""); + static_assert(noexcept(g()) == true, ""); + + } + + namespace test_constexpr + { + + template < typename CharT > + unsigned long constexpr + strlen_c_r(const CharT *const s, const unsigned long acc) noexcept + { + return *s ? strlen_c_r(s + 1, acc + 1) : acc; + } + + template < typename CharT > + unsigned long constexpr + strlen_c(const CharT *const s) noexcept + { + return strlen_c_r(s, 0UL); + } + + static_assert(strlen_c("") == 0UL, ""); + static_assert(strlen_c("1") == 1UL, ""); + static_assert(strlen_c("example") == 7UL, ""); + static_assert(strlen_c("another\0example") == 7UL, ""); + + } + + namespace test_rvalue_references + { + + template < int N > + struct answer + { + static constexpr int value = N; + }; + + answer<1> f(int&) { return answer<1>(); } + answer<2> f(const int&) { return answer<2>(); } + answer<3> f(int&&) { return answer<3>(); } + + void + test() + { + int i = 0; + const int c = 0; + static_assert(decltype(f(i))::value == 1, ""); + static_assert(decltype(f(c))::value == 2, ""); + static_assert(decltype(f(0))::value == 3, ""); + } + + } + + namespace test_uniform_initialization + { + + struct test + { + static const int zero {}; + static const int one {1}; + }; + + static_assert(test::zero == 0, ""); + static_assert(test::one == 1, ""); + + } + + namespace test_lambdas + { + + void + test1() + { + auto lambda1 = [](){}; + auto lambda2 = lambda1; + lambda1(); + lambda2(); + } + + int + test2() + { + auto a = [](int i, int j){ return i + j; }(1, 2); + auto b = []() -> int { return '0'; }(); + auto c = [=](){ return a + b; }(); + auto d = [&](){ return c; }(); + auto e = [a, &b](int x) mutable { + const auto identity = [](int y){ return y; }; + for (auto i = 0; i < a; ++i) + a += b--; + return x + identity(a + b); + }(0); + return a + b + c + d + e; + } + + int + test3() + { + const auto nullary = [](){ return 0; }; + const auto unary = [](int x){ return x; }; + using nullary_t = decltype(nullary); + using unary_t = decltype(unary); + const auto higher1st = [](nullary_t f){ return f(); }; + const auto higher2nd = [unary](nullary_t f1){ + return [unary, f1](unary_t f2){ return f2(unary(f1())); }; + }; + return higher1st(nullary) + higher2nd(nullary)(unary); + } + + } + + namespace test_variadic_templates + { + + template + struct sum; + + template + struct sum + { + static constexpr auto value = N0 + sum::value; + }; + + template <> + struct sum<> + { + static constexpr auto value = 0; + }; + + static_assert(sum<>::value == 0, ""); + static_assert(sum<1>::value == 1, ""); + static_assert(sum<23>::value == 23, ""); + static_assert(sum<1, 2>::value == 3, ""); + static_assert(sum<5, 5, 11>::value == 21, ""); + static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); + + } + + // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae + // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function + // because of this. + namespace test_template_alias_sfinae + { + + struct foo {}; + + template + using member = typename T::member_type; + + template + void func(...) {} + + template + void func(member*) {} + + void test(); + + void test() { func(0); } + + } + +} // namespace cxx11 + +#endif // __cplusplus >= 201103L + + + +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + eval $cachevar=yes +else + eval $cachevar=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CXX="$ac_save_CXX" +fi +eval ac_res=\$$cachevar + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + if eval test x\$$cachevar = xyes; then + CXX="$CXX $switch" + if test -n "$CXXCPP" ; then + CXXCPP="$CXXCPP $switch" + fi + ac_success=yes + break + fi + done + fi + + if test x$ac_success = xno; then + for alternative in ${ax_cxx_compile_alternatives}; do + for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do + cachevar=`$as_echo "ax_cv_cxx_compile_cxx11_$switch" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5 +$as_echo_n "checking whether $CXX supports C++11 features with $switch... " >&6; } +if eval \${$cachevar+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_CXX="$CXX" + CXX="$CXX $switch" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +// If the compiler admits that it is not ready for C++11, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201103L + +#error "This is not a C++11 compiler" + +#else + +namespace cxx11 +{ + + namespace test_static_assert + { + + template + struct check + { + static_assert(sizeof(int) <= sizeof(T), "not big enough"); + }; + + } + + namespace test_final_override + { + + struct Base + { + virtual void f() {} + }; + + struct Derived : public Base + { + virtual void f() override {} + }; + + } + + namespace test_double_right_angle_brackets + { + + template < typename T > + struct check {}; + + typedef check single_type; + typedef check> double_type; + typedef check>> triple_type; + typedef check>>> quadruple_type; + + } + + namespace test_decltype + { + + int + f() + { + int a = 1; + decltype(a) b = 2; + return a + b; + } + + } + + namespace test_type_deduction + { + + template < typename T1, typename T2 > + struct is_same + { + static const bool value = false; + }; + + template < typename T > + struct is_same + { + static const bool value = true; + }; + + template < typename T1, typename T2 > + auto + add(T1 a1, T2 a2) -> decltype(a1 + a2) + { + return a1 + a2; + } + + int + test(const int c, volatile int v) + { + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == false, ""); + auto ac = c; + auto av = v; + auto sumi = ac + av + 'x'; + auto sumf = ac + av + 1.0; + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == true, ""); + return (sumf > 0.0) ? sumi : add(c, v); + } + + } + + namespace test_noexcept + { + + int f() { return 0; } + int g() noexcept { return 0; } + + static_assert(noexcept(f()) == false, ""); + static_assert(noexcept(g()) == true, ""); + + } + + namespace test_constexpr + { + + template < typename CharT > + unsigned long constexpr + strlen_c_r(const CharT *const s, const unsigned long acc) noexcept + { + return *s ? strlen_c_r(s + 1, acc + 1) : acc; + } + + template < typename CharT > + unsigned long constexpr + strlen_c(const CharT *const s) noexcept + { + return strlen_c_r(s, 0UL); + } + + static_assert(strlen_c("") == 0UL, ""); + static_assert(strlen_c("1") == 1UL, ""); + static_assert(strlen_c("example") == 7UL, ""); + static_assert(strlen_c("another\0example") == 7UL, ""); + + } + + namespace test_rvalue_references + { + + template < int N > + struct answer + { + static constexpr int value = N; + }; + + answer<1> f(int&) { return answer<1>(); } + answer<2> f(const int&) { return answer<2>(); } + answer<3> f(int&&) { return answer<3>(); } + + void + test() + { + int i = 0; + const int c = 0; + static_assert(decltype(f(i))::value == 1, ""); + static_assert(decltype(f(c))::value == 2, ""); + static_assert(decltype(f(0))::value == 3, ""); + } + + } + + namespace test_uniform_initialization + { + + struct test + { + static const int zero {}; + static const int one {1}; + }; + + static_assert(test::zero == 0, ""); + static_assert(test::one == 1, ""); + + } + + namespace test_lambdas + { + + void + test1() + { + auto lambda1 = [](){}; + auto lambda2 = lambda1; + lambda1(); + lambda2(); + } + + int + test2() + { + auto a = [](int i, int j){ return i + j; }(1, 2); + auto b = []() -> int { return '0'; }(); + auto c = [=](){ return a + b; }(); + auto d = [&](){ return c; }(); + auto e = [a, &b](int x) mutable { + const auto identity = [](int y){ return y; }; + for (auto i = 0; i < a; ++i) + a += b--; + return x + identity(a + b); + }(0); + return a + b + c + d + e; + } + + int + test3() + { + const auto nullary = [](){ return 0; }; + const auto unary = [](int x){ return x; }; + using nullary_t = decltype(nullary); + using unary_t = decltype(unary); + const auto higher1st = [](nullary_t f){ return f(); }; + const auto higher2nd = [unary](nullary_t f1){ + return [unary, f1](unary_t f2){ return f2(unary(f1())); }; + }; + return higher1st(nullary) + higher2nd(nullary)(unary); + } + + } + + namespace test_variadic_templates + { + + template + struct sum; + + template + struct sum + { + static constexpr auto value = N0 + sum::value; + }; + + template <> + struct sum<> + { + static constexpr auto value = 0; + }; + + static_assert(sum<>::value == 0, ""); + static_assert(sum<1>::value == 1, ""); + static_assert(sum<23>::value == 23, ""); + static_assert(sum<1, 2>::value == 3, ""); + static_assert(sum<5, 5, 11>::value == 21, ""); + static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); + + } + + // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae + // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function + // because of this. + namespace test_template_alias_sfinae + { + + struct foo {}; + + template + using member = typename T::member_type; + + template + void func(...) {} + + template + void func(member*) {} + + void test(); + + void test() { func(0); } + + } + +} // namespace cxx11 + +#endif // __cplusplus >= 201103L + + + +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + eval $cachevar=yes +else + eval $cachevar=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CXX="$ac_save_CXX" +fi +eval ac_res=\$$cachevar + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + if eval test x\$$cachevar = xyes; then + CXX="$CXX $switch" + if test -n "$CXXCPP" ; then + CXXCPP="$CXXCPP $switch" + fi + ac_success=yes + break + fi + done + if test x$ac_success = xyes; then + break + fi + done + fi + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + if test x$ax_cxx_compile_cxx11_required = xtrue; then + if test x$ac_success = xno; then + as_fn_error $? "*** A compiler with support for C++11 language features is required." "$LINENO" 5 + fi + fi + if test x$ac_success = xno; then + HAVE_CXX11=0 + { $as_echo "$as_me:${as_lineno-$LINENO}: No compiler with C++11 support was found" >&5 +$as_echo "$as_me: No compiler with C++11 support was found" >&6;} + else + HAVE_CXX11=1 + +$as_echo "#define HAVE_CXX11 1" >>confdefs.h + + fi + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__((format))" >&5 +$as_echo_n "checking for __attribute__((format))... " >&6; } +if ${ax_cv_have_func_attribute_format+:} false; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + int foo(const char *p, ...) __attribute__((format(printf, 1, 2))); + +int +main () +{ + + ; + return 0; +} + +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + if test -s conftest.err; then : + ax_cv_have_func_attribute_format=no +else + ax_cv_have_func_attribute_format=yes +fi +else + ax_cv_have_func_attribute_format=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_func_attribute_format" >&5 +$as_echo "$ax_cv_have_func_attribute_format" >&6; } + + if test yes = $ax_cv_have_func_attribute_format; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_FUNC_ATTRIBUTE_FORMAT 1 +_ACEOF + +fi + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__((fallthrough))" >&5 +$as_echo_n "checking for __attribute__((fallthrough))... " >&6; } +if ${ax_cv_have_gcc_attribute_falltrough+:} false; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + void foo(int &i) + { + switch (i) + { + case 0: + i += 1; + __attribute__((fallthrough)); + default: + i += 1; + } + } + +int +main () +{ + + ; + return 0; +} + +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + if test -s conftest.err; then : + ax_cv_have_gcc_attribute_falltrough=no +else + ax_cv_have_gcc_attribute_falltrough=yes +fi +else + ax_cv_have_gcc_attribute_falltrough=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_gcc_attribute_falltrough" >&5 +$as_echo "$ax_cv_have_gcc_attribute_falltrough" >&6; } + + if test yes = $ax_cv_have_gcc_attribute_falltrough; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_GCC_ATTRIBUTE_FALLTHROUGH 1 +_ACEOF + +fi + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for [[clang::fallthrough]]" >&5 +$as_echo_n "checking for [[clang::fallthrough]]... " >&6; } +if ${ax_cv_have_clang_attribute_falltrough+:} false; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + void foo(int &i) + { + switch (i) + { + case 0: + i += 1; + [[clang::fallthrough]]; + default: + i += 1; + } + } + +int +main () +{ + + ; + return 0; +} + +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + if test -s conftest.err; then : + ax_cv_have_clang_attribute_falltrough=no +else + ax_cv_have_clang_attribute_falltrough=yes +fi +else + ax_cv_have_clang_attribute_falltrough=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_clang_attribute_falltrough" >&5 +$as_echo "$ax_cv_have_clang_attribute_falltrough" >&6; } + + if test yes = $ax_cv_have_clang_attribute_falltrough; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_CLANG_ATTRIBUTE_FALLTHROUGH 1 +_ACEOF + +fi + + + + + # ================================= # Libtool/Version Makefile settings # ================================= @@ -17160,9 +18313,9 @@ WPS_MINOR_VERSION=4 -WPS_MICRO_VERSION=7 +WPS_MICRO_VERSION=8 -WPS_VERSION=0.4.7 +WPS_VERSION=0.4.8 WPS_OBJDIR=$objdir @@ -17171,7 +18324,7 @@ # For 1.0.0 comment the first line and uncomment the second LT_AGE=0 -LT_REVISION=7 +LT_REVISION=8 @@ -17592,167 +18745,6 @@ fi -# ======== -# shared_ptr implementation -# ======== - -# Check whether --with-sharedptr was given. -if test "${with_sharedptr+set}" = set; then : - withval=$with_sharedptr; with_sharedptr="$withval" -else - with_sharedptr=boost - -fi - -case $with_sharedptr in #( - boost|c++11|tr1) : - ;; #( - *) : - as_fn_error $? "Unknown value of shared_ptr provider: $with_sharedptr" "$LINENO" 5 - ;; -esac - -if test "x$with_sharedptr" = "xc++11"; then : - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++11 shared ptr" >&5 -$as_echo_n "checking for c++11 shared ptr... " >&6; } - save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -std=c++11" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include -int -main () -{ -std::shared_ptr p; - - ; - return 0; -} - -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define SHAREDPTR_STD 1" >>confdefs.h - - -else - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - as_fn_error $? "Could not find C++11 implementation of shared_ptr" "$LINENO" 5 - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler needs -std=c++11" >&5 -$as_echo_n "checking whether the compiler needs -std=c++11... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include -int -main () -{ -std::shared_ptr p; - - ; - return 0; -} - -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -else - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - CXXFLAGS="$CXXFLAGS -std=c++11" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -if test "x$with_sharedptr" = "xtr1"; then : - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tr1 shared ptr" >&5 -$as_echo_n "checking for tr1 shared ptr... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include -int -main () -{ -std::tr1::shared_ptr p; - - ; - return 0; -} - -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define SHAREDPTR_TR1 1" >>confdefs.h - - -else - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - as_fn_error $? "Could not find TR1 implementation of shared_ptr" "$LINENO" 5 - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -if test "x$with_sharedptr" = "xboost"; then : - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for boost shared ptr" >&5 -$as_echo_n "checking for boost shared ptr... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include -int -main () -{ -boost::shared_ptr p; - - ; - return 0; -} - -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define SHAREDPTR_BOOST 1" >>confdefs.h - - -else - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - as_fn_error $? "Could not find Boost implementation of shared_ptr" "$LINENO" 5 - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi - # ============= # Documentation # ============= @@ -18779,7 +19771,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libwps $as_me 0.4.7, which was +This file was extended by libwps $as_me 0.4.8, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18845,7 +19837,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libwps config.status 0.4.7 +libwps config.status 0.4.8 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -20837,7 +21829,6 @@ full-debug: ${enable_full_debug} docs: ${build_docs} fuzzers: ${enable_fuzzers} - shared_ptr: ${with_sharedptr} static-tools: ${enable_static_tools} werror: ${enable_werror} ============================================================================== @@ -20849,7 +21840,6 @@ full-debug: ${enable_full_debug} docs: ${build_docs} fuzzers: ${enable_fuzzers} - shared_ptr: ${with_sharedptr} static-tools: ${enable_static_tools} werror: ${enable_werror} ============================================================================== diff -Nru libwps-0.4.7/configure.ac libwps-0.4.8/configure.ac --- libwps-0.4.7/configure.ac 2017-07-16 08:04:58.000000000 +0000 +++ libwps-0.4.8/configure.ac 2017-08-06 08:30:01.000000000 +0000 @@ -7,7 +7,7 @@ # ==================== m4_define([libwps_version_major],[0]) m4_define([libwps_version_minor],[4]) -m4_define([libwps_version_micro],[7]) +m4_define([libwps_version_micro],[8]) m4_define([libwps_version],[libwps_version_major.libwps_version_minor.libwps_version_micro]) # ============= @@ -35,6 +35,10 @@ PKG_PROG_PKG_CONFIG([0.20]) +AX_CXX_COMPILE_STDCXX_11 +AX_GCC_FUNC_ATTRIBUTE([format]) +DLP_FALLTHROUGH + # ================================= # Libtool/Version Makefile settings # ================================= @@ -236,81 +240,6 @@ ]) AM_CONDITIONAL(STATIC_TOOLS, [test "x$enable_static_tools" = "xyes"]) -# ======== -# shared_ptr implementation -# ======== -AC_ARG_WITH(sharedptr, - [AS_HELP_STRING([--with-sharedptr=boost|c++11|tr1], - [Use Boost|std::memory|std::tr1::memory for shared ptr implementation])], - [with_sharedptr="$withval"], - [with_sharedptr=boost] -) -AS_CASE([$with_sharedptr], - [boost|c++11|tr1], [], - [AC_MSG_ERROR([Unknown value of shared_ptr provider: $with_sharedptr])] -) - -AS_IF([test "x$with_sharedptr" = "xc++11"], [ - AC_MSG_CHECKING([for c++11 shared ptr]) - save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -std=c++11" - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM( - [[#include ]], - [[std::shared_ptr p;]] - ) - ], [ - AC_MSG_RESULT([yes]) - AC_DEFINE([SHAREDPTR_STD],[1],[Use C++11 implementation of shared_ptr]) - ], [ - AC_MSG_RESULT([no]) - AC_MSG_ERROR([Could not find C++11 implementation of shared_ptr]) - ]) - CXXFLAGS="$save_CXXFLAGS" - AC_MSG_CHECKING([whether the compiler needs -std=c++11]) - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM( - [[#include ]], - [[std::shared_ptr p;]] - ) - ], [ - AC_MSG_RESULT([no]) - ], [ - AC_MSG_RESULT([yes]) - CXXFLAGS="$CXXFLAGS -std=c++11" - ]) -]) -AS_IF([test "x$with_sharedptr" = "xtr1"], [ - AC_MSG_CHECKING([for tr1 shared ptr]) - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM( - [[#include ]], - [[std::tr1::shared_ptr p;]] - ) - ], [ - AC_MSG_RESULT([yes]) - AC_DEFINE([SHAREDPTR_TR1],[1],[Use TR1 implementation of shared_ptr]) - ], [ - AC_MSG_RESULT([no]) - AC_MSG_ERROR([Could not find TR1 implementation of shared_ptr]) - ]) -]) -AS_IF([test "x$with_sharedptr" = "xboost"], [ - AC_MSG_CHECKING([for boost shared ptr]) - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM( - [[#include ]], - [[boost::shared_ptr p;]] - ) - ], [ - AC_MSG_RESULT([yes]) - AC_DEFINE([SHAREDPTR_BOOST],[1],[Use Boost implementation of shared_ptr]) - ], [ - AC_MSG_RESULT([no]) - AC_MSG_ERROR([Could not find Boost implementation of shared_ptr]) - ]) -]) - # ============= # Documentation # ============= @@ -414,7 +343,6 @@ full-debug: ${enable_full_debug} docs: ${build_docs} fuzzers: ${enable_fuzzers} - shared_ptr: ${with_sharedptr} static-tools: ${enable_static_tools} werror: ${enable_werror} ============================================================================== diff -Nru libwps-0.4.7/debian/changelog libwps-0.4.8/debian/changelog --- libwps-0.4.7/debian/changelog 2017-07-17 17:14:58.000000000 +0000 +++ libwps-0.4.8/debian/changelog 2017-11-27 18:52:39.000000000 +0000 @@ -1,3 +1,9 @@ +libwps (0.4.8-1) unstable; urgency=medium + + * New upstream version 0.4.8 + + -- Rene Engelhard Mon, 27 Nov 2017 19:52:39 +0100 + libwps (0.4.7-1) unstable; urgency=medium * New upstream version 0.4.7 diff -Nru libwps-0.4.7/docs/doxygen/Makefile.in libwps-0.4.8/docs/doxygen/Makefile.in --- libwps-0.4.7/docs/doxygen/Makefile.in 2017-07-16 08:05:52.000000000 +0000 +++ libwps-0.4.8/docs/doxygen/Makefile.in 2017-11-15 10:22:45.000000000 +0000 @@ -89,10 +89,13 @@ host_triplet = @host@ subdir = docs/doxygen ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \ + $(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \ + $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \ + $(top_srcdir)/m4/dlp_fallthrough.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -155,6 +158,7 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff -Nru libwps-0.4.7/docs/Makefile.in libwps-0.4.8/docs/Makefile.in --- libwps-0.4.7/docs/Makefile.in 2017-07-16 08:05:52.000000000 +0000 +++ libwps-0.4.8/docs/Makefile.in 2017-11-15 10:22:45.000000000 +0000 @@ -89,10 +89,13 @@ host_triplet = @host@ subdir = docs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \ + $(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \ + $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \ + $(top_srcdir)/m4/dlp_fallthrough.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -215,6 +218,7 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff -Nru libwps-0.4.7/inc/libwps/Makefile.in libwps-0.4.8/inc/libwps/Makefile.in --- libwps-0.4.7/inc/libwps/Makefile.in 2017-07-16 08:05:52.000000000 +0000 +++ libwps-0.4.8/inc/libwps/Makefile.in 2017-11-15 10:22:45.000000000 +0000 @@ -90,10 +90,13 @@ host_triplet = @host@ subdir = inc/libwps ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \ + $(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \ + $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \ + $(top_srcdir)/m4/dlp_fallthrough.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(dist_libwps_HEADERS) \ @@ -204,6 +207,7 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff -Nru libwps-0.4.7/inc/Makefile.in libwps-0.4.8/inc/Makefile.in --- libwps-0.4.7/inc/Makefile.in 2017-07-16 08:05:52.000000000 +0000 +++ libwps-0.4.8/inc/Makefile.in 2017-11-15 10:22:45.000000000 +0000 @@ -89,10 +89,13 @@ host_triplet = @host@ subdir = inc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \ + $(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \ + $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \ + $(top_srcdir)/m4/dlp_fallthrough.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -215,6 +218,7 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff -Nru libwps-0.4.7/m4/ax_cxx_compile_stdcxx_11.m4 libwps-0.4.8/m4/ax_cxx_compile_stdcxx_11.m4 --- libwps-0.4.7/m4/ax_cxx_compile_stdcxx_11.m4 1970-01-01 00:00:00.000000000 +0000 +++ libwps-0.4.8/m4/ax_cxx_compile_stdcxx_11.m4 2017-07-30 09:06:27.000000000 +0000 @@ -0,0 +1,39 @@ +# ============================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html +# ============================================================================= +# +# SYNOPSIS +# +# AX_CXX_COMPILE_STDCXX_11([ext|noext], [mandatory|optional]) +# +# DESCRIPTION +# +# Check for baseline language coverage in the compiler for the C++11 +# standard; if necessary, add switches to CXX and CXXCPP to enable +# support. +# +# This macro is a convenience alias for calling the AX_CXX_COMPILE_STDCXX +# macro with the version set to C++11. The two optional arguments are +# forwarded literally as the second and third argument respectively. +# Please see the documentation for the AX_CXX_COMPILE_STDCXX macro for +# more information. If you want to use this macro, you also need to +# download the ax_cxx_compile_stdcxx.m4 file. +# +# LICENSE +# +# Copyright (c) 2008 Benjamin Kosnik +# Copyright (c) 2012 Zack Weinberg +# Copyright (c) 2013 Roy Stogner +# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov +# Copyright (c) 2015 Paul Norman +# Copyright (c) 2015 Moritz Klammler +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 18 + +AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX]) +AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [AX_CXX_COMPILE_STDCXX([11], [$1], [$2])]) diff -Nru libwps-0.4.7/m4/ax_cxx_compile_stdcxx.m4 libwps-0.4.8/m4/ax_cxx_compile_stdcxx.m4 --- libwps-0.4.7/m4/ax_cxx_compile_stdcxx.m4 1970-01-01 00:00:00.000000000 +0000 +++ libwps-0.4.8/m4/ax_cxx_compile_stdcxx.m4 2017-07-30 09:06:27.000000000 +0000 @@ -0,0 +1,982 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional]) +# +# DESCRIPTION +# +# Check for baseline language coverage in the compiler for the specified +# version of the C++ standard. If necessary, add switches to CXX and +# CXXCPP to enable support. VERSION may be '11' (for the C++11 standard) +# or '14' (for the C++14 standard). +# +# The second argument, if specified, indicates whether you insist on an +# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. +# -std=c++11). If neither is specified, you get whatever works, with +# preference for an extended mode. +# +# The third argument, if specified 'mandatory' or if left unspecified, +# indicates that baseline support for the specified C++ standard is +# required and that the macro should error out if no mode with that +# support is found. If specified 'optional', then configuration proceeds +# regardless, after defining HAVE_CXX${VERSION} if and only if a +# supporting mode is found. +# +# LICENSE +# +# Copyright (c) 2008 Benjamin Kosnik +# Copyright (c) 2012 Zack Weinberg +# Copyright (c) 2013 Roy Stogner +# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov +# Copyright (c) 2015 Paul Norman +# Copyright (c) 2015 Moritz Klammler +# Copyright (c) 2016 Krzesimir Nowak +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +dnl This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro +dnl (serial version number 13). + +AX_REQUIRE_DEFINED([AC_MSG_WARN]) +AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl + m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"], + [$1], [14], [ax_cxx_compile_alternatives="14 1y"], + [$1], [17], [ax_cxx_compile_alternatives="17 1z"], + [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl + m4_if([$2], [], [], + [$2], [ext], [], + [$2], [noext], [], + [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl + m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true], + [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true], + [$3], [optional], [ax_cxx_compile_cxx$1_required=false], + [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])]) + AC_LANG_PUSH([C++])dnl + ac_success=no + AC_CACHE_CHECK(whether $CXX supports C++$1 features by default, + ax_cv_cxx_compile_cxx$1, + [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], + [ax_cv_cxx_compile_cxx$1=yes], + [ax_cv_cxx_compile_cxx$1=no])]) + if test x$ax_cv_cxx_compile_cxx$1 = xyes; then + ac_success=yes + fi + + m4_if([$2], [noext], [], [dnl + if test x$ac_success = xno; then + for alternative in ${ax_cxx_compile_alternatives}; do + switch="-std=gnu++${alternative}" + cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) + AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, + $cachevar, + [ac_save_CXX="$CXX" + CXX="$CXX $switch" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], + [eval $cachevar=yes], + [eval $cachevar=no]) + CXX="$ac_save_CXX"]) + if eval test x\$$cachevar = xyes; then + CXX="$CXX $switch" + if test -n "$CXXCPP" ; then + CXXCPP="$CXXCPP $switch" + fi + ac_success=yes + break + fi + done + fi]) + + m4_if([$2], [ext], [], [dnl + if test x$ac_success = xno; then + dnl HP's aCC needs +std=c++11 according to: + dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf + dnl Cray's crayCC needs "-h std=c++11" + for alternative in ${ax_cxx_compile_alternatives}; do + for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do + cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) + AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, + $cachevar, + [ac_save_CXX="$CXX" + CXX="$CXX $switch" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], + [eval $cachevar=yes], + [eval $cachevar=no]) + CXX="$ac_save_CXX"]) + if eval test x\$$cachevar = xyes; then + CXX="$CXX $switch" + if test -n "$CXXCPP" ; then + CXXCPP="$CXXCPP $switch" + fi + ac_success=yes + break + fi + done + if test x$ac_success = xyes; then + break + fi + done + fi]) + AC_LANG_POP([C++]) + if test x$ax_cxx_compile_cxx$1_required = xtrue; then + if test x$ac_success = xno; then + AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.]) + fi + fi + if test x$ac_success = xno; then + HAVE_CXX$1=0 + AC_MSG_NOTICE([No compiler with C++$1 support was found]) + else + HAVE_CXX$1=1 + AC_DEFINE(HAVE_CXX$1,1, + [define if the compiler supports basic C++$1 syntax]) + fi + AC_SUBST(HAVE_CXX$1) + m4_if([$1], [17], [AC_MSG_WARN([C++17 is not yet standardized, so the checks may change in incompatible ways anytime])]) +]) + + +dnl Test body for checking C++11 support + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11], + _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 +) + + +dnl Test body for checking C++14 support + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14], + _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 + _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 +) + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17], + _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 + _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 + _AX_CXX_COMPILE_STDCXX_testbody_new_in_17 +) + +dnl Tests for new features in C++11 + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[ + +// If the compiler admits that it is not ready for C++11, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201103L + +#error "This is not a C++11 compiler" + +#else + +namespace cxx11 +{ + + namespace test_static_assert + { + + template + struct check + { + static_assert(sizeof(int) <= sizeof(T), "not big enough"); + }; + + } + + namespace test_final_override + { + + struct Base + { + virtual void f() {} + }; + + struct Derived : public Base + { + virtual void f() override {} + }; + + } + + namespace test_double_right_angle_brackets + { + + template < typename T > + struct check {}; + + typedef check single_type; + typedef check> double_type; + typedef check>> triple_type; + typedef check>>> quadruple_type; + + } + + namespace test_decltype + { + + int + f() + { + int a = 1; + decltype(a) b = 2; + return a + b; + } + + } + + namespace test_type_deduction + { + + template < typename T1, typename T2 > + struct is_same + { + static const bool value = false; + }; + + template < typename T > + struct is_same + { + static const bool value = true; + }; + + template < typename T1, typename T2 > + auto + add(T1 a1, T2 a2) -> decltype(a1 + a2) + { + return a1 + a2; + } + + int + test(const int c, volatile int v) + { + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == false, ""); + auto ac = c; + auto av = v; + auto sumi = ac + av + 'x'; + auto sumf = ac + av + 1.0; + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == true, ""); + return (sumf > 0.0) ? sumi : add(c, v); + } + + } + + namespace test_noexcept + { + + int f() { return 0; } + int g() noexcept { return 0; } + + static_assert(noexcept(f()) == false, ""); + static_assert(noexcept(g()) == true, ""); + + } + + namespace test_constexpr + { + + template < typename CharT > + unsigned long constexpr + strlen_c_r(const CharT *const s, const unsigned long acc) noexcept + { + return *s ? strlen_c_r(s + 1, acc + 1) : acc; + } + + template < typename CharT > + unsigned long constexpr + strlen_c(const CharT *const s) noexcept + { + return strlen_c_r(s, 0UL); + } + + static_assert(strlen_c("") == 0UL, ""); + static_assert(strlen_c("1") == 1UL, ""); + static_assert(strlen_c("example") == 7UL, ""); + static_assert(strlen_c("another\0example") == 7UL, ""); + + } + + namespace test_rvalue_references + { + + template < int N > + struct answer + { + static constexpr int value = N; + }; + + answer<1> f(int&) { return answer<1>(); } + answer<2> f(const int&) { return answer<2>(); } + answer<3> f(int&&) { return answer<3>(); } + + void + test() + { + int i = 0; + const int c = 0; + static_assert(decltype(f(i))::value == 1, ""); + static_assert(decltype(f(c))::value == 2, ""); + static_assert(decltype(f(0))::value == 3, ""); + } + + } + + namespace test_uniform_initialization + { + + struct test + { + static const int zero {}; + static const int one {1}; + }; + + static_assert(test::zero == 0, ""); + static_assert(test::one == 1, ""); + + } + + namespace test_lambdas + { + + void + test1() + { + auto lambda1 = [](){}; + auto lambda2 = lambda1; + lambda1(); + lambda2(); + } + + int + test2() + { + auto a = [](int i, int j){ return i + j; }(1, 2); + auto b = []() -> int { return '0'; }(); + auto c = [=](){ return a + b; }(); + auto d = [&](){ return c; }(); + auto e = [a, &b](int x) mutable { + const auto identity = [](int y){ return y; }; + for (auto i = 0; i < a; ++i) + a += b--; + return x + identity(a + b); + }(0); + return a + b + c + d + e; + } + + int + test3() + { + const auto nullary = [](){ return 0; }; + const auto unary = [](int x){ return x; }; + using nullary_t = decltype(nullary); + using unary_t = decltype(unary); + const auto higher1st = [](nullary_t f){ return f(); }; + const auto higher2nd = [unary](nullary_t f1){ + return [unary, f1](unary_t f2){ return f2(unary(f1())); }; + }; + return higher1st(nullary) + higher2nd(nullary)(unary); + } + + } + + namespace test_variadic_templates + { + + template + struct sum; + + template + struct sum + { + static constexpr auto value = N0 + sum::value; + }; + + template <> + struct sum<> + { + static constexpr auto value = 0; + }; + + static_assert(sum<>::value == 0, ""); + static_assert(sum<1>::value == 1, ""); + static_assert(sum<23>::value == 23, ""); + static_assert(sum<1, 2>::value == 3, ""); + static_assert(sum<5, 5, 11>::value == 21, ""); + static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); + + } + + // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae + // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function + // because of this. + namespace test_template_alias_sfinae + { + + struct foo {}; + + template + using member = typename T::member_type; + + template + void func(...) {} + + template + void func(member*) {} + + void test(); + + void test() { func(0); } + + } + +} // namespace cxx11 + +#endif // __cplusplus >= 201103L + +]]) + + +dnl Tests for new features in C++14 + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[ + +// If the compiler admits that it is not ready for C++14, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201402L + +#error "This is not a C++14 compiler" + +#else + +namespace cxx14 +{ + + namespace test_polymorphic_lambdas + { + + int + test() + { + const auto lambda = [](auto&&... args){ + const auto istiny = [](auto x){ + return (sizeof(x) == 1UL) ? 1 : 0; + }; + const int aretiny[] = { istiny(args)... }; + return aretiny[0]; + }; + return lambda(1, 1L, 1.0f, '1'); + } + + } + + namespace test_binary_literals + { + + constexpr auto ivii = 0b0000000000101010; + static_assert(ivii == 42, "wrong value"); + + } + + namespace test_generalized_constexpr + { + + template < typename CharT > + constexpr unsigned long + strlen_c(const CharT *const s) noexcept + { + auto length = 0UL; + for (auto p = s; *p; ++p) + ++length; + return length; + } + + static_assert(strlen_c("") == 0UL, ""); + static_assert(strlen_c("x") == 1UL, ""); + static_assert(strlen_c("test") == 4UL, ""); + static_assert(strlen_c("another\0test") == 7UL, ""); + + } + + namespace test_lambda_init_capture + { + + int + test() + { + auto x = 0; + const auto lambda1 = [a = x](int b){ return a + b; }; + const auto lambda2 = [a = lambda1(x)](){ return a; }; + return lambda2(); + } + + } + + namespace test_digit_separators + { + + constexpr auto ten_million = 100'000'000; + static_assert(ten_million == 100000000, ""); + + } + + namespace test_return_type_deduction + { + + auto f(int& x) { return x; } + decltype(auto) g(int& x) { return x; } + + template < typename T1, typename T2 > + struct is_same + { + static constexpr auto value = false; + }; + + template < typename T > + struct is_same + { + static constexpr auto value = true; + }; + + int + test() + { + auto x = 0; + static_assert(is_same::value, ""); + static_assert(is_same::value, ""); + return x; + } + + } + +} // namespace cxx14 + +#endif // __cplusplus >= 201402L + +]]) + + +dnl Tests for new features in C++17 + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_17], [[ + +// If the compiler admits that it is not ready for C++17, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus <= 201402L + +#error "This is not a C++17 compiler" + +#else + +#if defined(__clang__) + #define REALLY_CLANG +#else + #if defined(__GNUC__) + #define REALLY_GCC + #endif +#endif + +#include +#include +#include + +namespace cxx17 +{ + +#if !defined(REALLY_CLANG) + namespace test_constexpr_lambdas + { + + // TODO: test it with clang++ from git + + constexpr int foo = [](){return 42;}(); + + } +#endif // !defined(REALLY_CLANG) + + namespace test::nested_namespace::definitions + { + + } + + namespace test_fold_expression + { + + template + int multiply(Args... args) + { + return (args * ... * 1); + } + + template + bool all(Args... args) + { + return (args && ...); + } + + } + + namespace test_extended_static_assert + { + + static_assert (true); + + } + + namespace test_auto_brace_init_list + { + + auto foo = {5}; + auto bar {5}; + + static_assert(std::is_same, decltype(foo)>::value); + static_assert(std::is_same::value); + } + + namespace test_typename_in_template_template_parameter + { + + template typename X> struct D; + + } + + namespace test_fallthrough_nodiscard_maybe_unused_attributes + { + + int f1() + { + return 42; + } + + [[nodiscard]] int f2() + { + [[maybe_unused]] auto unused = f1(); + + switch (f1()) + { + case 17: + f1(); + [[fallthrough]]; + case 42: + f1(); + } + return f1(); + } + + } + + namespace test_extended_aggregate_initialization + { + + struct base1 + { + int b1, b2 = 42; + }; + + struct base2 + { + base2() { + b3 = 42; + } + int b3; + }; + + struct derived : base1, base2 + { + int d; + }; + + derived d1 {{1, 2}, {}, 4}; // full initialization + derived d2 {{}, {}, 4}; // value-initialized bases + + } + + namespace test_general_range_based_for_loop + { + + struct iter + { + int i; + + int& operator* () + { + return i; + } + + const int& operator* () const + { + return i; + } + + iter& operator++() + { + ++i; + return *this; + } + }; + + struct sentinel + { + int i; + }; + + bool operator== (const iter& i, const sentinel& s) + { + return i.i == s.i; + } + + bool operator!= (const iter& i, const sentinel& s) + { + return !(i == s); + } + + struct range + { + iter begin() const + { + return {0}; + } + + sentinel end() const + { + return {5}; + } + }; + + void f() + { + range r {}; + + for (auto i : r) + { + [[maybe_unused]] auto v = i; + } + } + + } + + namespace test_lambda_capture_asterisk_this_by_value + { + + struct t + { + int i; + int foo() + { + return [*this]() + { + return i; + }(); + } + }; + + } + + namespace test_enum_class_construction + { + + enum class byte : unsigned char + {}; + + byte foo {42}; + + } + + namespace test_constexpr_if + { + + template + int f () + { + if constexpr(cond) + { + return 13; + } + else + { + return 42; + } + } + + } + + namespace test_selection_statement_with_initializer + { + + int f() + { + return 13; + } + + int f2() + { + if (auto i = f(); i > 0) + { + return 3; + } + + switch (auto i = f(); i + 4) + { + case 17: + return 2; + + default: + return 1; + } + } + + } + +#if !defined(REALLY_CLANG) + namespace test_template_argument_deduction_for_class_templates + { + + // TODO: test it with clang++ from git + + template + struct pair + { + pair (T1 p1, T2 p2) + : m1 {p1}, + m2 {p2} + {} + + T1 m1; + T2 m2; + }; + + void f() + { + [[maybe_unused]] auto p = pair{13, 42u}; + } + + } +#endif // !defined(REALLY_CLANG) + + namespace test_non_type_auto_template_parameters + { + + template + struct B + {}; + + B<5> b1; + B<'a'> b2; + + } + +#if !defined(REALLY_CLANG) + namespace test_structured_bindings + { + + // TODO: test it with clang++ from git + + int arr[2] = { 1, 2 }; + std::pair pr = { 1, 2 }; + + auto f1() -> int(&)[2] + { + return arr; + } + + auto f2() -> std::pair& + { + return pr; + } + + struct S + { + int x1 : 2; + volatile double y1; + }; + + S f3() + { + return {}; + } + + auto [ x1, y1 ] = f1(); + auto& [ xr1, yr1 ] = f1(); + auto [ x2, y2 ] = f2(); + auto& [ xr2, yr2 ] = f2(); + const auto [ x3, y3 ] = f3(); + + } +#endif // !defined(REALLY_CLANG) + +#if !defined(REALLY_CLANG) + namespace test_exception_spec_type_system + { + + // TODO: test it with clang++ from git + + struct Good {}; + struct Bad {}; + + void g1() noexcept; + void g2(); + + template + Bad + f(T*, T*); + + template + Good + f(T1*, T2*); + + static_assert (std::is_same_v); + + } +#endif // !defined(REALLY_CLANG) + + namespace test_inline_variables + { + + template void f(T) + {} + + template inline T g(T) + { + return T{}; + } + + template<> inline void f<>(int) + {} + + template<> int g<>(int) + { + return 5; + } + + } + +} // namespace cxx17 + +#endif // __cplusplus <= 201402L + +]]) diff -Nru libwps-0.4.7/m4/ax_gcc_func_attribute.m4 libwps-0.4.8/m4/ax_gcc_func_attribute.m4 --- libwps-0.4.7/m4/ax_gcc_func_attribute.m4 1970-01-01 00:00:00.000000000 +0000 +++ libwps-0.4.8/m4/ax_gcc_func_attribute.m4 2017-08-06 08:30:43.000000000 +0000 @@ -0,0 +1,226 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_gcc_func_attribute.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_GCC_FUNC_ATTRIBUTE(ATTRIBUTE) +# +# DESCRIPTION +# +# This macro checks if the compiler supports one of GCC's function +# attributes; many other compilers also provide function attributes with +# the same syntax. Compiler warnings are used to detect supported +# attributes as unsupported ones are ignored by default so quieting +# warnings when using this macro will yield false positives. +# +# The ATTRIBUTE parameter holds the name of the attribute to be checked. +# +# If ATTRIBUTE is supported define HAVE_FUNC_ATTRIBUTE_. +# +# The macro caches its result in the ax_cv_have_func_attribute_ +# variable. +# +# The macro currently supports the following function attributes: +# +# alias +# aligned +# alloc_size +# always_inline +# artificial +# cold +# const +# constructor +# constructor_priority for constructor attribute with priority +# deprecated +# destructor +# dllexport +# dllimport +# error +# externally_visible +# flatten +# format +# format_arg +# gnu_inline +# hot +# ifunc +# leaf +# malloc +# noclone +# noinline +# nonnull +# noreturn +# nothrow +# optimize +# pure +# unused +# used +# visibility +# warning +# warn_unused_result +# weak +# weakref +# +# Unsuppored function attributes will be tested with a prototype returning +# an int and not accepting any arguments and the result of the check might +# be wrong or meaningless so use with care. +# +# LICENSE +# +# Copyright (c) 2013 Gabriele Svelto +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 5 + +AC_DEFUN([AX_GCC_FUNC_ATTRIBUTE], [ + AS_VAR_PUSHDEF([ac_var], [ax_cv_have_func_attribute_$1]) + + AC_CACHE_CHECK([for __attribute__(($1))], [ac_var], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ + m4_case([$1], + [alias], [ + int foo( void ) { return 0; } + int bar( void ) __attribute__(($1("foo"))); + ], + [aligned], [ + int foo( void ) __attribute__(($1(32))); + ], + [alloc_size], [ + void *foo(int a) __attribute__(($1(1))); + ], + [always_inline], [ + inline __attribute__(($1)) int foo( void ) { return 0; } + ], + [artificial], [ + inline __attribute__(($1)) int foo( void ) { return 0; } + ], + [cold], [ + int foo( void ) __attribute__(($1)); + ], + [const], [ + int foo( void ) __attribute__(($1)); + ], + [constructor_priority], [ + int foo( void ) __attribute__((__constructor__(65535/2))); + ], + [constructor], [ + int foo( void ) __attribute__(($1)); + ], + [deprecated], [ + int foo( void ) __attribute__(($1(""))); + ], + [destructor], [ + int foo( void ) __attribute__(($1)); + ], + [dllexport], [ + __attribute__(($1)) int foo( void ) { return 0; } + ], + [dllimport], [ + int foo( void ) __attribute__(($1)); + ], + [error], [ + int foo( void ) __attribute__(($1(""))); + ], + [externally_visible], [ + int foo( void ) __attribute__(($1)); + ], + [flatten], [ + int foo( void ) __attribute__(($1)); + ], + [format], [ + int foo(const char *p, ...) __attribute__(($1(printf, 1, 2))); + ], + [format_arg], [ + char *foo(const char *p) __attribute__(($1(1))); + ], + [gnu_inline], [ + inline __attribute__(($1)) int foo( void ) { return 0; } + ], + [hot], [ + int foo( void ) __attribute__(($1)); + ], + [ifunc], [ + int my_foo( void ) { return 0; } + static int (*resolve_foo(void))(void) { return my_foo; } + int foo( void ) __attribute__(($1("resolve_foo"))); + ], + [leaf], [ + __attribute__(($1)) int foo( void ) { return 0; } + ], + [malloc], [ + void *foo( void ) __attribute__(($1)); + ], + [noclone], [ + int foo( void ) __attribute__(($1)); + ], + [noinline], [ + __attribute__(($1)) int foo( void ) { return 0; } + ], + [nonnull], [ + int foo(char *p) __attribute__(($1(1))); + ], + [noreturn], [ + void foo( void ) __attribute__(($1)); + ], + [nothrow], [ + int foo( void ) __attribute__(($1)); + ], + [optimize], [ + __attribute__(($1(3))) int foo( void ) { return 0; } + ], + [pure], [ + int foo( void ) __attribute__(($1)); + ], + [returns_nonnull], [ + void *foo( void ) __attribute__(($1)); + ], + [unused], [ + int foo( void ) __attribute__(($1)); + ], + [used], [ + int foo( void ) __attribute__(($1)); + ], + [visibility], [ + int foo_def( void ) __attribute__(($1("default"))); + int foo_hid( void ) __attribute__(($1("hidden"))); + int foo_int( void ) __attribute__(($1("internal"))); + int foo_pro( void ) __attribute__(($1("protected"))); + ], + [warning], [ + int foo( void ) __attribute__(($1(""))); + ], + [warn_unused_result], [ + int foo( void ) __attribute__(($1)); + ], + [weak], [ + int foo( void ) __attribute__(($1)); + ], + [weakref], [ + static int foo( void ) { return 0; } + static int bar( void ) __attribute__(($1("foo"))); + ], + [ + m4_warn([syntax], [Unsupported attribute $1, the test may fail]) + int foo( void ) __attribute__(($1)); + ] + )], []) + ], + dnl GCC doesn't exit with an error if an unknown attribute is + dnl provided but only outputs a warning, so accept the attribute + dnl only if no warning were issued. + [AS_IF([test -s conftest.err], + [AS_VAR_SET([ac_var], [no])], + [AS_VAR_SET([ac_var], [yes])])], + [AS_VAR_SET([ac_var], [no])]) + ]) + + AS_IF([test yes = AS_VAR_GET([ac_var])], + [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_FUNC_ATTRIBUTE_$1), 1, + [Define to 1 if the system has the `$1' function attribute])], []) + + AS_VAR_POPDEF([ac_var]) +]) diff -Nru libwps-0.4.7/m4/dlp_fallthrough.m4 libwps-0.4.8/m4/dlp_fallthrough.m4 --- libwps-0.4.7/m4/dlp_fallthrough.m4 1970-01-01 00:00:00.000000000 +0000 +++ libwps-0.4.8/m4/dlp_fallthrough.m4 2017-07-30 09:23:33.000000000 +0000 @@ -0,0 +1,65 @@ +# +# SYNOPSIS +# +# DLP_FALLTHROUGH +# +# DESCRIPTION +# +# This macro checks if the compiler supports a fallthrough warning +# suppression attribute in GCC or CLANG style. +# +# If a fallthrough warning suppression attribute is supported define +# HAVE_