Merge branch 'master' into devel

Conflicts:
	.travis.yml
	Examples/test-suite/common.mk
This commit is contained in:
Oliver Buchtala 2014-03-30 23:07:56 +02:00
commit 158c8b6732
114 changed files with 2861 additions and 1708 deletions

View file

@ -288,6 +288,7 @@ CPP_TEST_CASES += \
naturalvar_more \
naturalvar_onoff \
nested_class \
nested_directors \
nested_comment \
nested_scope \
nested_workaround \
@ -298,6 +299,7 @@ CPP_TEST_CASES += \
operator_pointer_ref \
operbool \
ordering \
overload_bool \
overload_copy \
overload_extend \
overload_method \
@ -351,6 +353,7 @@ CPP_TEST_CASES += \
smart_pointer_simple \
smart_pointer_static \
smart_pointer_template_const_overload \
smart_pointer_template_defaults_overload \
smart_pointer_templatemethods \
smart_pointer_templatevariables \
smart_pointer_typedef \
@ -501,7 +504,8 @@ ifndef SMOKE_TESTS_ONLY
# C++11 test cases.
CPP11_TEST_CASES = \
cpp11_alternate_function_syntax \
cpp11_alignment \
cpp11_alternate_function_syntax \
cpp11_constexpr \
cpp11_decltype \
cpp11_default_delete \
@ -516,6 +520,7 @@ CPP11_TEST_CASES = \
cpp11_noexcept \
cpp11_null_pointer_constant \
cpp11_raw_string_literals \
cpp11_result_of \
cpp11_rvalue_reference \
cpp11_rvalue_reference2 \
cpp11_rvalue_reference3 \
@ -525,19 +530,19 @@ CPP11_TEST_CASES = \
cpp11_template_double_brackets \
cpp11_template_explicit \
cpp11_template_typedefs \
cpp11_uniform_initialization \
cpp11_type_traits \
cpp11_uniform_initialization \
cpp11_unrestricted_unions \
cpp11_userdefined_literals \
cpp11_variadic_templates
# cpp11_hash_tables \ # not fully implemented yet
# cpp11_result_of \ # SWIG does not support
# cpp11_strongly_typed_enumerations \ # SWIG not quite getting this right yet in all langs
endif # SMOKE_TESTS_ONLY
# Broken C++11 test cases.
CPP11_TEST_BROKEN =
CPP11_TEST_BROKEN = \
# cpp11_hash_tables \ # not fully implemented yet
# cpp11_strongly_typed_enumerations \ # SWIG not quite getting this right yet in all langs
# cpp11_variadic_templates \ # Broken for some languages (such as Java)
# cpp11_reference_wrapper \ # No typemaps
ifndef SMOKE_TESTS_ONLY
@ -589,6 +594,7 @@ C_TEST_CASES += \
enums \
enum_forward \
enum_macro \
enum_missing \
extern_declaration \
funcptr \
function_typedef \