TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove support for array other than std::array

Browse source 
Building with Boost.Array fails due to name lookup errors.  These could
be fixed, but since no one has reported them and they are fairly old,
Boost.Array appears to be unused.  Remove support for it.

Building with std::tr1::array fails due to missing features in
std::tr1:array relative to std::array.  No one has reported this either,
so remove support for std::tr1:array.

Move the test for std::array into the Cxx11RequiredFeature list so that
it is run as part of the group test, rather than as a separate
statement.
This commit is contained in:
Kp 2016-07-31 22:25:49 +00:00
parent 2f938a35d9
commit 7d3c3288a9
2 changed files with 7 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
SConstruct
View file

@ -322,6 +322,13 @@ struct %(N)s_derived : %(N)s_base {
%(N)s_derived(int e) : %(N)s_base{e} {}
};
'''),
Cxx11RequiredFeature('std::array', '''
#include "compiler-array.h"
''', '''
array<int,2>b;
b[0]=1;
'''
),
Cxx11RequiredFeature('std::unordered_map::emplace', '''
#include <unordered_map>
''', '''
@ -1254,36 +1261,6 @@ fail.
def __skip_missing_cxx_std(self,level,text,kwargs):
if self.__cxx_conformance < level:
kwargs.setdefault('skipped', text)
@_implicit_test
def check_boost_array(self,context,**kwargs):
"""
help:assume Boost.Array works
"""
return self.Compile(context, msg='for Boost.Array', successflags={'CPPDEFINES' : ['DXX_HAVE_BOOST_ARRAY']}, **kwargs)
@_implicit_test
def check_cxx_array(self,context,_successflags={'CPPDEFINES' : ['DXX_HAVE_CXX_ARRAY']},**kwargs):
"""
help:assume <array> works
"""
return self.Compile(context, msg='for <array>', successflags=_successflags, **kwargs)
@_implicit_test
def check_cxx_tr1_array(self,context,**kwargs):
"""
help:assume <tr1/array> works
"""
return self.Compile(context, msg='for <tr1/array>', successflags={'CPPDEFINES' : ['DXX_HAVE_CXX_TR1_ARRAY']}, **kwargs)
@_custom_test
def _check_cxx_array(self,context):
include = '''
#include "compiler-array.h"
'''
main = '''
array<int,2>b;
b[0]=1;
'''
how = self.check_cxx_array(context, text=include, main=main) or self.check_boost_array(context, text=include, main=main) or self.check_cxx_tr1_array(context, text=include, main=main)
if not how:
raise SCons.Errors.StopError("C++ compiler does not support <array> or Boost.Array or <tr1/array>.")
def _check_static_assert_method(self,context,msg,f,testflags={},_tdict={'expr' : 'true&&true'},_fdict={'expr' : 'false||false'},**kwargs):
_Compile = self.Compile
return _Compile(context, text=f % _tdict, main='f(A());', msg=msg % 'true', testflags=testflags, **kwargs) and \

10
common/include/compiler-array.h
View file

@ -6,15 +6,5 @@
*/
#pragma once
#if defined(DXX_HAVE_CXX_ARRAY)
#include <array>
using std::array;
#elif defined(DXX_HAVE_CXX_TR1_ARRAY)
#include <tr1/array>
using std::tr1::array;
#elif defined(DXX_HAVE_BOOST_ARRAY)
#include <boost/array.hpp>
using boost::array;
#else
#error "No <array> implementation found."
#endif