Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
graph-tool
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
40
Issues
40
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tiago Peixoto
graph-tool
Commits
2736fecc
Commit
2736fecc
authored
Sep 25, 2015
by
Tiago Peixoto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move to C++14
parent
077b32e1
Pipeline
#9
canceled with stage
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
39 additions
and
39 deletions
+39
-39
configure.ac
configure.ac
+1
-1
m4/ax_cxx_compile_stdcxx_14.m4
m4/ax_cxx_compile_stdcxx_14.m4
+38
-38
No files found.
configure.ac
View file @
2736fecc
...
@@ -30,7 +30,7 @@ AC_DISABLE_STATIC
...
@@ -30,7 +30,7 @@ AC_DISABLE_STATIC
LT_INIT
LT_INIT
AC_PROG_INSTALL
AC_PROG_INSTALL
AX_CXX_COMPILE_STDCXX_1
1
([ext],[mandatory])
AX_CXX_COMPILE_STDCXX_1
4
([ext],[mandatory])
dnl turn on warnings
dnl turn on warnings
[CXXFLAGS="-Wall -Wextra -ftemplate-backtrace-limit=0 ${CXXFLAGS}"]
[CXXFLAGS="-Wall -Wextra -ftemplate-backtrace-limit=0 ${CXXFLAGS}"]
...
...
m4/ax_cxx_compile_stdcxx_1
1
.m4
→
m4/ax_cxx_compile_stdcxx_1
4
.m4
View file @
2736fecc
# ============================================================================
# ============================================================================
# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_1
1
.html
# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_1
4
.html
# ============================================================================
# ============================================================================
#
#
# SYNOPSIS
# SYNOPSIS
#
#
# AX_CXX_COMPILE_STDCXX_1
1
([ext|noext],[mandatory|optional])
# AX_CXX_COMPILE_STDCXX_1
4
([ext|noext],[mandatory|optional])
#
#
# DESCRIPTION
# DESCRIPTION
#
#
# Check for baseline language coverage in the compiler for the C++1
1
# Check for baseline language coverage in the compiler for the C++1
4
# standard; if necessary, add switches to CXXFLAGS to enable support.
# standard; if necessary, add switches to CXXFLAGS to enable support.
#
#
# The first argument, if specified, indicates whether you insist on an
# The first argument, if specified, indicates whether you insist on an
# extended mode (e.g. -std=gnu++1
1
) or a strict conformance mode (e.g.
# extended mode (e.g. -std=gnu++1
4
) or a strict conformance mode (e.g.
# -std=c++1
1
). If neither is specified, you get whatever works, with
# -std=c++1
4
). If neither is specified, you get whatever works, with
# preference for an extended mode.
# preference for an extended mode.
#
#
# The second argument, if specified 'mandatory' or if left unspecified,
# The second argument, if specified 'mandatory' or if left unspecified,
# indicates that baseline C++1
1
support is required and that the macro
# indicates that baseline C++1
4
support is required and that the macro
# should error out if no mode with that support is found. If specified
# should error out if no mode with that support is found. If specified
# 'optional', then configuration proceeds regardless, after defining
# 'optional', then configuration proceeds regardless, after defining
# HAVE_CXX1
1
if and only if a supporting mode is found.
# HAVE_CXX1
4
if and only if a supporting mode is found.
#
#
# LICENSE
# LICENSE
#
#
...
@@ -34,9 +34,9 @@
...
@@ -34,9 +34,9 @@
# and this notice are preserved. This file is offered as-is, without any
# and this notice are preserved. This file is offered as-is, without any
# warranty.
# warranty.
#serial 1
1
#serial 1
4
m4_define([_AX_CXX_COMPILE_STDCXX_1
1
_testbody], [[
m4_define([_AX_CXX_COMPILE_STDCXX_1
4
_testbody], [[
template <typename T>
template <typename T>
struct check
struct check
{
{
...
@@ -86,35 +86,35 @@ m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [[
...
@@ -86,35 +86,35 @@ m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [[
}
}
]])
]])
AC_DEFUN([AX_CXX_COMPILE_STDCXX_1
1
], [dnl
AC_DEFUN([AX_CXX_COMPILE_STDCXX_1
4
], [dnl
m4_if([$1], [], [],
m4_if([$1], [], [],
[$1], [ext], [],
[$1], [ext], [],
[$1], [noext], [],
[$1], [noext], [],
[m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_1
1
])])dnl
[m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_1
4
])])dnl
m4_if([$2], [], [ax_cxx_compile_cxx1
1
_required=true],
m4_if([$2], [], [ax_cxx_compile_cxx1
4
_required=true],
[$2], [mandatory], [ax_cxx_compile_cxx1
1
_required=true],
[$2], [mandatory], [ax_cxx_compile_cxx1
4
_required=true],
[$2], [optional], [ax_cxx_compile_cxx1
1
_required=false],
[$2], [optional], [ax_cxx_compile_cxx1
4
_required=false],
[m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_1
1
])])
[m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_1
4
])])
AC_LANG_PUSH([C++])dnl
AC_LANG_PUSH([C++])dnl
ac_success=no
ac_success=no
AC_CACHE_CHECK(whether $CXX supports C++1
1
features by default,
AC_CACHE_CHECK(whether $CXX supports C++1
4
features by default,
ax_cv_cxx_compile_cxx1
1
,
ax_cv_cxx_compile_cxx1
4
,
[AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_1
1
_testbody])],
[AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_1
4
_testbody])],
[ax_cv_cxx_compile_cxx1
1
=yes],
[ax_cv_cxx_compile_cxx1
4
=yes],
[ax_cv_cxx_compile_cxx1
1
=no])])
[ax_cv_cxx_compile_cxx1
4
=no])])
if test x$ax_cv_cxx_compile_cxx1
1
= xyes; then
if test x$ax_cv_cxx_compile_cxx1
4
= xyes; then
ac_success=yes
ac_success=yes
fi
fi
m4_if([$1], [noext], [], [dnl
m4_if([$1], [noext], [], [dnl
if test x$ac_success = xno; then
if test x$ac_success = xno; then
for switch in -std=gnu++1
1 -std=gnu++0x
; do
for switch in -std=gnu++1
4 -std=gnu++1y
; do
cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx1
1
_$switch])
cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx1
4
_$switch])
AC_CACHE_CHECK(whether $CXX supports C++1
1
features with $switch,
AC_CACHE_CHECK(whether $CXX supports C++1
4
features with $switch,
$cachevar,
$cachevar,
[ac_save_CXXFLAGS="$CXXFLAGS"
[ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $switch"
CXXFLAGS="$CXXFLAGS $switch"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_1
1
_testbody])],
AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_1
4
_testbody])],
[eval $cachevar=yes],
[eval $cachevar=yes],
[eval $cachevar=no])
[eval $cachevar=no])
CXXFLAGS="$ac_save_CXXFLAGS"])
CXXFLAGS="$ac_save_CXXFLAGS"])
...
@@ -128,15 +128,15 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl
...
@@ -128,15 +128,15 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl
m4_if([$1], [ext], [], [dnl
m4_if([$1], [ext], [], [dnl
if test x$ac_success = xno; then
if test x$ac_success = xno; then
dnl HP's aCC needs +std=c++1
1
according to:
dnl HP's aCC needs +std=c++1
4
according to:
dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf
dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf
for switch in -std=c++1
1 -std=c++0x +std=c++11
; do
for switch in -std=c++1
4 -std=c++1y +std=c++14
; do
cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx1
1
_$switch])
cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx1
4
_$switch])
AC_CACHE_CHECK(whether $CXX supports C++1
1
features with $switch,
AC_CACHE_CHECK(whether $CXX supports C++1
4
features with $switch,
$cachevar,
$cachevar,
[ac_save_CXXFLAGS="$CXXFLAGS"
[ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $switch"
CXXFLAGS="$CXXFLAGS $switch"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_1
1
_testbody])],
AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_1
4
_testbody])],
[eval $cachevar=yes],
[eval $cachevar=yes],
[eval $cachevar=no])
[eval $cachevar=no])
CXXFLAGS="$ac_save_CXXFLAGS"])
CXXFLAGS="$ac_save_CXXFLAGS"])
...
@@ -148,20 +148,20 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl
...
@@ -148,20 +148,20 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl
done
done
fi])
fi])
AC_LANG_POP([C++])
AC_LANG_POP([C++])
if test x$ax_cxx_compile_cxx1
1
_required = xtrue; then
if test x$ax_cxx_compile_cxx1
4
_required = xtrue; then
if test x$ac_success = xno; then
if test x$ac_success = xno; then
AC_MSG_ERROR([*** A compiler with support for C++1
1
language features is required.])
AC_MSG_ERROR([*** A compiler with support for C++1
4
language features is required.])
fi
fi
else
else
if test x$ac_success = xno; then
if test x$ac_success = xno; then
HAVE_CXX1
1
=0
HAVE_CXX1
4
=0
AC_MSG_NOTICE([No compiler with C++1
1
support was found])
AC_MSG_NOTICE([No compiler with C++1
4
support was found])
else
else
HAVE_CXX1
1
=1
HAVE_CXX1
4
=1
AC_DEFINE(HAVE_CXX1
1
,1,
AC_DEFINE(HAVE_CXX1
4
,1,
[define if the compiler supports basic C++1
1
syntax])
[define if the compiler supports basic C++1
4
syntax])
fi
fi
AC_SUBST(HAVE_CXX1
1
)
AC_SUBST(HAVE_CXX1
4
)
fi
fi
])
])
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment