.gitignore | 1 configure.ac | 3 m4/.gitignore | 2 m4/ax_cxx_compile_stdcxx.m4 | 562 +++++++++++++++++++++++++++++++++++++++++ m4/ax_cxx_compile_stdcxx_11.m4 | 39 ++ src/lib/VDXParser.cpp | 5 src/lib/VSDXMLHelper.cpp | 5 src/lib/VSDXMLHelper.h | 3 src/lib/VSDXMLParserBase.cpp | 9 src/lib/VSDXMetaData.cpp | 4 src/lib/VSDXParser.cpp | 11 src/lib/VSDXTheme.cpp | 4 src/lib/VisioDocument.cpp | 5 src/lib/libvisio_utils.h | 4 src/lib/libvisio_xml.cpp | 8 src/lib/libvisio_xml.h | 10 16 files changed, 638 insertions(+), 37 deletions(-)
New commits: commit ad74fbdf0dadd419d02078f48e3a19cd8dd7a8f5 Author: David Tardon <[email protected]> Date: Fri Apr 7 15:58:47 2017 +0200 drop unused includes Change-Id: I4d75bfb583a7a5a7698b672b31ed139c439dc8f2 diff --git a/src/lib/VDXParser.cpp b/src/lib/VDXParser.cpp index e2f025f..276b36f 100644 --- a/src/lib/VDXParser.cpp +++ b/src/lib/VDXParser.cpp @@ -12,7 +12,6 @@ #include <libxml/xmlIO.h> #include <libxml/xmlstring.h> #include <librevenge-stream/librevenge-stream.h> -#include <boost/algorithm/string.hpp> #include "VDXParser.h" #include "libvisio_utils.h" #include "libvisio_xml.h" diff --git a/src/lib/VSDXMLHelper.cpp b/src/lib/VSDXMLHelper.cpp index e212f14..bacc2c6 100644 --- a/src/lib/VSDXMLHelper.cpp +++ b/src/lib/VSDXMLHelper.cpp @@ -16,7 +16,6 @@ #include <istream> #include <vector> #include <boost/algorithm/string.hpp> -#include <boost/lexical_cast.hpp> #include <librevenge-stream/librevenge-stream.h> #include "VSDXMLHelper.h" #include "libvisio_utils.h" diff --git a/src/lib/VSDXMLParserBase.cpp b/src/lib/VSDXMLParserBase.cpp index 4d534bb..d5a1005 100644 --- a/src/lib/VSDXMLParserBase.cpp +++ b/src/lib/VSDXMLParserBase.cpp @@ -12,7 +12,6 @@ #include <libxml/xmlIO.h> #include <libxml/xmlstring.h> #include <librevenge-stream/librevenge-stream.h> -#include <boost/algorithm/string.hpp> #include <boost/spirit/include/classic.hpp> #include "VSDXMLParserBase.h" #include "libvisio_utils.h" diff --git a/src/lib/VSDXParser.cpp b/src/lib/VSDXParser.cpp index 817be96..13fd050 100644 --- a/src/lib/VSDXParser.cpp +++ b/src/lib/VSDXParser.cpp @@ -12,7 +12,6 @@ #include <libxml/xmlIO.h> #include <libxml/xmlstring.h> #include <librevenge-stream/librevenge-stream.h> -#include <boost/algorithm/string.hpp> #include "VSDXParser.h" #include "libvisio_utils.h" #include "libvisio_xml.h" commit c41531b797af11b52dac75a88445090a8ec86339 Author: David Tardon <[email protected]> Date: Fri Apr 7 15:54:10 2017 +0200 boost::shared_ptr -> std::shared_ptr Change-Id: I873a476e8428c8c3ca0a45d721d5ba3b300a33b4 diff --git a/configure.ac b/configure.ac index bb227a1..93bc784 100644 --- a/configure.ac +++ b/configure.ac @@ -86,7 +86,6 @@ AC_CHECK_HEADERS( boost/algorithm/string.hpp \ boost/lexical_cast.hpp \ boost/optional.hpp \ - boost/shared_ptr.hpp \ boost/spirit/include/classic.hpp, [], [AC_MSG_ERROR(Required boost headers not found. install boost >= 1.36)], diff --git a/src/lib/VDXParser.cpp b/src/lib/VDXParser.cpp index e81ef0c..e2f025f 100644 --- a/src/lib/VDXParser.cpp +++ b/src/lib/VDXParser.cpp @@ -7,12 +7,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include <memory> #include <string.h> #include <libxml/xmlIO.h> #include <libxml/xmlstring.h> #include <librevenge-stream/librevenge-stream.h> #include <boost/algorithm/string.hpp> -#include <boost/shared_ptr.hpp> #include "VDXParser.h" #include "libvisio_utils.h" #include "libvisio_xml.h" @@ -75,7 +75,7 @@ bool libvisio::VDXParser::processXmlDocument(librevenge::RVNGInputStream *input) if (!input) return false; - const boost::shared_ptr<xmlTextReader> reader( + const std::shared_ptr<xmlTextReader> reader( xmlReaderForStream(input, 0, 0, XML_PARSE_NOBLANKS|XML_PARSE_NOENT|XML_PARSE_NONET|XML_PARSE_RECOVER), xmlFreeTextReader); if (!reader) diff --git a/src/lib/VSDXMLHelper.cpp b/src/lib/VSDXMLHelper.cpp index 5bd40f0..e212f14 100644 --- a/src/lib/VSDXMLHelper.cpp +++ b/src/lib/VSDXMLHelper.cpp @@ -11,12 +11,12 @@ #define BOOST_LEXICAL_CAST_ASSUME_C_LOCALE 1 #endif +#include <memory> #include <sstream> #include <istream> #include <vector> #include <boost/algorithm/string.hpp> #include <boost/lexical_cast.hpp> -#include <boost/shared_ptr.hpp> #include <librevenge-stream/librevenge-stream.h> #include "VSDXMLHelper.h" #include "libvisio_utils.h" @@ -95,7 +95,7 @@ libvisio::VSDXRelationships::VSDXRelationships(librevenge::RVNGInputStream *inpu { if (input) { - const boost::shared_ptr<xmlTextReader> reader( + const std::shared_ptr<xmlTextReader> reader( xmlReaderForStream(input, 0, 0, XML_PARSE_NOBLANKS|XML_PARSE_NOENT|XML_PARSE_NONET|XML_PARSE_RECOVER), xmlFreeTextReader); if (reader) diff --git a/src/lib/VSDXMLHelper.h b/src/lib/VSDXMLHelper.h index 0a46a6a..948db65 100644 --- a/src/lib/VSDXMLHelper.h +++ b/src/lib/VSDXMLHelper.h @@ -11,8 +11,9 @@ #define __VSDXMLHELPER_H__ #include <map> +#include <memory> #include <string> -#include <boost/shared_ptr.hpp> + #include <librevenge-stream/librevenge-stream.h> #include <libxml/xmlreader.h> #include "VSDTypes.h" diff --git a/src/lib/VSDXMLParserBase.cpp b/src/lib/VSDXMLParserBase.cpp index e06e3af..4d534bb 100644 --- a/src/lib/VSDXMLParserBase.cpp +++ b/src/lib/VSDXMLParserBase.cpp @@ -7,12 +7,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include <memory> #include <string.h> #include <libxml/xmlIO.h> #include <libxml/xmlstring.h> #include <librevenge-stream/librevenge-stream.h> #include <boost/algorithm/string.hpp> -#include <boost/shared_ptr.hpp> #include <boost/spirit/include/classic.hpp> #include "VSDXMLParserBase.h" #include "libvisio_utils.h" @@ -22,7 +22,7 @@ #include "VSDXMLHelper.h" #include "VSDXMLTokenMap.h" -using boost::shared_ptr; +using std::shared_ptr; libvisio::VSDXMLParserBase::VSDXMLParserBase() : m_collector(), m_stencils(), m_currentStencil(0), m_shape(), @@ -2216,7 +2216,7 @@ int libvisio::VSDXMLParserBase::readExtendedColourData(Colour &value, xmlTextRea unsigned libvisio::VSDXMLParserBase::getIX(xmlTextReaderPtr reader) { unsigned ix = MINUS_ONE; - const boost::shared_ptr<xmlChar> ixString(xmlTextReaderGetAttribute(reader, BAD_CAST("IX")), xmlFree); + const std::shared_ptr<xmlChar> ixString(xmlTextReaderGetAttribute(reader, BAD_CAST("IX")), xmlFree); if (ixString) ix = (unsigned)xmlStringToLong(ixString.get()); return ix; @@ -2227,7 +2227,7 @@ void libvisio::VSDXMLParserBase::readTriggerId(unsigned &id, xmlTextReaderPtr re using namespace ::boost::spirit::classic; unsigned triggerId = MINUS_ONE; - const boost::shared_ptr<xmlChar> triggerString(xmlTextReaderGetAttribute(reader, BAD_CAST("F")), xmlFree); + const std::shared_ptr<xmlChar> triggerString(xmlTextReaderGetAttribute(reader, BAD_CAST("F")), xmlFree); if (triggerString) { if (parse((const char *)triggerString.get(), diff --git a/src/lib/VSDXMetaData.cpp b/src/lib/VSDXMetaData.cpp index 2d9a45c..003b37d 100644 --- a/src/lib/VSDXMetaData.cpp +++ b/src/lib/VSDXMetaData.cpp @@ -11,8 +11,8 @@ #include "VSDXMLTokenMap.h" #include "libvisio_utils.h" #include "libvisio_xml.h" +#include <memory> #include <string> -#include <boost/shared_ptr.hpp> libvisio::VSDXMetaData::VSDXMetaData() : m_metaData() @@ -119,7 +119,7 @@ bool libvisio::VSDXMetaData::parse(librevenge::RVNGInputStream *input) XMLErrorWatcher watcher; - const boost::shared_ptr<xmlTextReader> reader( + const std::shared_ptr<xmlTextReader> reader( xmlReaderForStream(input, 0, 0, XML_PARSE_NOBLANKS|XML_PARSE_NOENT|XML_PARSE_NONET, &watcher), xmlFreeTextReader); if (!reader) diff --git a/src/lib/VSDXParser.cpp b/src/lib/VSDXParser.cpp index 36bda6a..817be96 100644 --- a/src/lib/VSDXParser.cpp +++ b/src/lib/VSDXParser.cpp @@ -7,12 +7,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include <memory> #include <string.h> #include <libxml/xmlIO.h> #include <libxml/xmlstring.h> #include <librevenge-stream/librevenge-stream.h> #include <boost/algorithm/string.hpp> -#include <boost/shared_ptr.hpp> #include "VSDXParser.h" #include "libvisio_utils.h" #include "libvisio_xml.h" @@ -304,7 +304,7 @@ void libvisio::VSDXParser::processXmlDocument(librevenge::RVNGInputStream *input XMLErrorWatcher watcher; - const boost::shared_ptr<xmlTextReader> reader( + const std::shared_ptr<xmlTextReader> reader( xmlReaderForStream(input, 0, 0, XML_PARSE_NOBLANKS|XML_PARSE_NOENT|XML_PARSE_NONET, &watcher), xmlFreeTextReader); if (!reader) @@ -326,7 +326,7 @@ void libvisio::VSDXParser::processXmlDocument(librevenge::RVNGInputStream *input case XML_REL: if (XML_READER_TYPE_ELEMENT == tokenType) { - boost::shared_ptr<xmlChar> id(xmlTextReaderGetAttribute(reader.get(), BAD_CAST("r:id")), xmlFree); + std::shared_ptr<xmlChar> id(xmlTextReaderGetAttribute(reader.get(), BAD_CAST("r:id")), xmlFree); if (id) { const VSDXRelationship *rel = rels.getRelationshipById((char *)id.get()); @@ -1402,7 +1402,7 @@ void libvisio::VSDXParser::readTabRow(xmlTextReaderPtr reader) case XML_POSITION: if (XML_READER_TYPE_ELEMENT == tokenType) { - const boost::shared_ptr<xmlChar> stringValue(xmlTextReaderGetAttribute(reader, BAD_CAST("N")), xmlFree); + const std::shared_ptr<xmlChar> stringValue(xmlTextReaderGetAttribute(reader, BAD_CAST("N")), xmlFree); if (stringValue) { unsigned idx = xmlStringToLong(stringValue.get()+8); @@ -1413,7 +1413,7 @@ void libvisio::VSDXParser::readTabRow(xmlTextReaderPtr reader) case XML_ALIGNMENT: if (XML_READER_TYPE_ELEMENT == tokenType) { - const boost::shared_ptr<xmlChar> stringValue(xmlTextReaderGetAttribute(reader, BAD_CAST("N")), xmlFree); + const std::shared_ptr<xmlChar> stringValue(xmlTextReaderGetAttribute(reader, BAD_CAST("N")), xmlFree); if (stringValue) { unsigned idx = xmlStringToLong(stringValue.get()+9); diff --git a/src/lib/VSDXTheme.cpp b/src/lib/VSDXTheme.cpp index a05484b..ccfb2ac 100644 --- a/src/lib/VSDXTheme.cpp +++ b/src/lib/VSDXTheme.cpp @@ -9,13 +9,13 @@ #include "VSDXTheme.h" -#include <boost/shared_ptr.hpp> +#include <memory> #include "VSDXMLTokenMap.h" #include "libvisio_utils.h" #include "libvisio_xml.h" -using boost::shared_ptr; +using std::shared_ptr; libvisio::VSDXVariationClrScheme::VSDXVariationClrScheme() : m_varColor1() diff --git a/src/lib/VisioDocument.cpp b/src/lib/VisioDocument.cpp index b8099e5..ec8fcd7 100644 --- a/src/lib/VisioDocument.cpp +++ b/src/lib/VisioDocument.cpp @@ -7,8 +7,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include <memory> #include <string> -#include <boost/shared_ptr.hpp> + #include <librevenge/librevenge.h> #include <libvisio/libvisio.h> #include "libvisio_utils.h" @@ -250,7 +251,7 @@ static bool isXmlVisioDocument(librevenge::RVNGInputStream *input) try { input->seek(0, librevenge::RVNG_SEEK_SET); - const boost::shared_ptr<xmlTextReader> reader( + const std::shared_ptr<xmlTextReader> reader( libvisio::xmlReaderForStream(input, 0, 0, XML_PARSE_NOBLANKS|XML_PARSE_NOENT|XML_PARSE_NONET|XML_PARSE_RECOVER), xmlFreeTextReader); if (!reader) diff --git a/src/lib/libvisio_utils.h b/src/lib/libvisio_utils.h index ea63867..7857068 100644 --- a/src/lib/libvisio_utils.h +++ b/src/lib/libvisio_utils.h @@ -10,7 +10,7 @@ #ifndef __LIBVISIO_UTILS_H__ #define __LIBVISIO_UTILS_H__ -#include <boost/shared_ptr.hpp> +#include <memory> #include "VSDTypes.h" @@ -75,7 +75,7 @@ typedef unsigned __int64 uint64_t; namespace libvisio { -typedef boost::shared_ptr<librevenge::RVNGInputStream> RVNGInputStreamPtr_t; +typedef std::shared_ptr<librevenge::RVNGInputStream> RVNGInputStreamPtr_t; uint8_t readU8(librevenge::RVNGInputStream *input); uint16_t readU16(librevenge::RVNGInputStream *input); diff --git a/src/lib/libvisio_xml.cpp b/src/lib/libvisio_xml.cpp index 9941ee9..18214b2 100644 --- a/src/lib/libvisio_xml.cpp +++ b/src/lib/libvisio_xml.cpp @@ -131,7 +131,7 @@ Colour xmlStringToColour(const xmlChar *s) return Colour((val & 0xff0000) >> 16, (val & 0xff00) >> 8, val & 0xff, 0); } -Colour xmlStringToColour(const boost::shared_ptr<xmlChar> &s) +Colour xmlStringToColour(const std::shared_ptr<xmlChar> &s) { return xmlStringToColour(s.get()); } @@ -155,7 +155,7 @@ long xmlStringToLong(const xmlChar *s) return 0; } -long xmlStringToLong(const boost::shared_ptr<xmlChar> &s) +long xmlStringToLong(const std::shared_ptr<xmlChar> &s) { return xmlStringToLong(s.get()); } @@ -173,7 +173,7 @@ catch (const boost::bad_lexical_cast &) throw XmlParserException(); } -double xmlStringToDouble(const boost::shared_ptr<xmlChar> &s) +double xmlStringToDouble(const std::shared_ptr<xmlChar> &s) { return xmlStringToDouble(s.get()); } @@ -197,7 +197,7 @@ bool xmlStringToBool(const xmlChar *s) } -bool xmlStringToBool(const boost::shared_ptr<xmlChar> &s) +bool xmlStringToBool(const std::shared_ptr<xmlChar> &s) { return xmlStringToBool(s.get()); } diff --git a/src/lib/libvisio_xml.h b/src/lib/libvisio_xml.h index 298b739..5875a73 100644 --- a/src/lib/libvisio_xml.h +++ b/src/lib/libvisio_xml.h @@ -10,7 +10,7 @@ #ifndef __LIBVISIO_XML_H__ #define __LIBVISIO_XML_H__ -#include <boost/shared_ptr.hpp> +#include <memory> #include <librevenge-stream/librevenge-stream.h> @@ -47,16 +47,16 @@ xmlTextReaderPtr xmlReaderForStream(librevenge::RVNGInputStream *input, XMLErrorWatcher *watcher = 0); Colour xmlStringToColour(const xmlChar *s); -Colour xmlStringToColour(const boost::shared_ptr<xmlChar> &s); +Colour xmlStringToColour(const std::shared_ptr<xmlChar> &s); long xmlStringToLong(const xmlChar *s); -long xmlStringToLong(const boost::shared_ptr<xmlChar> &s); +long xmlStringToLong(const std::shared_ptr<xmlChar> &s); double xmlStringToDouble(const xmlChar *s); -double xmlStringToDouble(const boost::shared_ptr<xmlChar> &s); +double xmlStringToDouble(const std::shared_ptr<xmlChar> &s); bool xmlStringToBool(const xmlChar *s); -bool xmlStringToBool(const boost::shared_ptr<xmlChar> &s); +bool xmlStringToBool(const std::shared_ptr<xmlChar> &s); } // namespace libvisio commit 9ed04deb8286d87446ee211ee3f3ccd36ec8b874 Author: David Tardon <[email protected]> Date: Fri Apr 7 15:51:11 2017 +0200 switch to C++11 Change-Id: I5e5f66968da458d8b3c8455b77b1bd9289c83e40 diff --git a/configure.ac b/configure.ac index b7950ad..bb227a1 100644 --- a/configure.ac +++ b/configure.ac @@ -38,6 +38,8 @@ PKG_PROG_PKG_CONFIG([0.20]) AC_PROG_EGREP AC_PROG_SED +AX_CXX_COMPILE_STDCXX_11([noext]) + dnl =================================================================== dnl Check for gperf dnl =================================================================== diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4 new file mode 100644 index 0000000..2c18e49 --- /dev/null +++ b/m4/ax_cxx_compile_stdcxx.m4 @@ -0,0 +1,562 @@ +# =========================================================================== +# http://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 <[email protected]> +# Copyright (c) 2012 Zack Weinberg <[email protected]> +# Copyright (c) 2013 Roy Stogner <[email protected]> +# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <[email protected]> +# Copyright (c) 2015 Paul Norman <[email protected]> +# Copyright (c) 2015 Moritz Klammler <[email protected]> +# +# 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 4 + +dnl This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro +dnl (serial version number 13). + +AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl + m4_if([$1], [11], [], + [$1], [14], [], + [$1], [17], [m4_fatal([support for C++17 not yet implemented in AX_CXX_COMPILE_STDCXX])], + [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 switch in -std=gnu++$1 -std=gnu++0x; 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 + 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 switch in -std=c++$1 -std=c++0x +std=c++$1 "-h std=c++$1"; 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 + 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) +]) + + +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 +) + + +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 <typename T> + 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<void> single_type; + typedef check<check<void>> double_type; + typedef check<check<check<void>>> triple_type; + typedef check<check<check<check<void>>>> 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<T, T> + { + 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<int, decltype(0)>::value == true, ""); + static_assert(is_same<int, decltype(c)>::value == false, ""); + static_assert(is_same<int, decltype(v)>::value == false, ""); + auto ac = c; + auto av = v; + auto sumi = ac + av + 'x'; + auto sumf = ac + av + 1.0; + static_assert(is_same<int, decltype(ac)>::value == true, ""); + static_assert(is_same<int, decltype(av)>::value == true, ""); + static_assert(is_same<int, decltype(sumi)>::value == true, ""); + static_assert(is_same<int, decltype(sumf)>::value == false, ""); + static_assert(is_same<int, decltype(add(c, v))>::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 <int...> + struct sum; + + template <int N0, int... N1toN> + struct sum<N0, N1toN...> + { + static constexpr auto value = N0 + sum<N1toN...>::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<typename T> + using member = typename T::member_type; + + template<typename T> + void func(...) {} + + template<typename T> + void func(member<T>*) {} + + void test(); + + void test() { func<foo>(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_seperators + { + + 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<T, T> + { + static constexpr auto value = true; + }; + + int + test() + { + auto x = 0; + static_assert(is_same<int, decltype(f(x))>::value, ""); + static_assert(is_same<int&, decltype(g(x))>::value, ""); + return x; + } + + } + +} // namespace cxx14 + +#endif // __cplusplus >= 201402L + +]]) diff --git a/m4/ax_cxx_compile_stdcxx_11.m4 b/m4/ax_cxx_compile_stdcxx_11.m4 new file mode 100644 index 0000000..0aadeaf --- /dev/null +++ b/m4/ax_cxx_compile_stdcxx_11.m4 @@ -0,0 +1,39 @@ +# ============================================================================ +# http://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 <[email protected]> +# Copyright (c) 2012 Zack Weinberg <[email protected]> +# Copyright (c) 2013 Roy Stogner <[email protected]> +# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <[email protected]> +# Copyright (c) 2015 Paul Norman <[email protected]> +# Copyright (c) 2015 Moritz Klammler <[email protected]> +# +# 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 17 + +AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX]) +AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [AX_CXX_COMPILE_STDCXX([11], [$1], [$2])]) commit beb4eaead00835cde8e87becb5204fe1da70da52 Author: David Tardon <[email protected]> Date: Fri Apr 7 15:49:37 2017 +0200 ignore only auto-generated .m4 files Change-Id: I79c3085ce13b83f1a30e128e6b1ca9ad284ff50f diff --git a/.gitignore b/.gitignore index 96ddc28..188c1aa 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,6 @@ libtool libvisio.spec libvisio-zip ltmain.sh -m4 missing mkinstalldirs stamp-h1 diff --git a/m4/.gitignore b/m4/.gitignore new file mode 100644 index 0000000..94f2b51 --- /dev/null +++ b/m4/.gitignore @@ -0,0 +1,2 @@ +libtool.m4 +lt*.m4 _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
