Skip to content

Commit

Permalink
Fix build (#454)
Browse files Browse the repository at this point in the history
* Fix C++11 syntax. It fixes build with GCC.

* Be Python 3.x compatible by replacing print "XXX" by print("XXX")
  • Loading branch information
ggardet authored and AnthonyBarbier committed Jun 29, 2018
1 parent b3a371b commit e2542c9
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
14 changes: 7 additions & 7 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@ if env['build'] == "embed_only":
Return()

if env['neon'] and 'x86' in env['arch']:
print "Cannot compile NEON for x86"
print("Cannot compile NEON for x86")
Exit(1)

if env['set_soname'] and not version_at_least(SCons.__version__, "2.4"):
print "Setting the library's SONAME / SHLIBVERSION requires SCons 2.4 or above"
print "Update your version of SCons or use set_soname=0"
print("Setting the library's SONAME / SHLIBVERSION requires SCons 2.4 or above")
print("Update your version of SCons or use set_soname=0")
Exit(1)

if env['os'] == 'bare_metal':
Expand All @@ -99,7 +99,7 @@ cpp_compiler = os.environ.get('CXX', default_cpp_compiler)
c_compiler = os.environ.get('CC', default_c_compiler)

if env['os'] == 'android' and ( 'clang++' not in cpp_compiler or 'clang' not in c_compiler ):
print "WARNING: Only clang is officially supported to build the Compute Library for Android"
print( "WARNING: Only clang is officially supported to build the Compute Library for Android")

if 'clang++' in cpp_compiler:
env.Append(CXXFLAGS = ['-Wno-format-nonliteral','-Wno-deprecated-increment-bool','-Wno-vla-extension','-Wno-mismatched-tags'])
Expand All @@ -111,7 +111,7 @@ if env['cppthreads']:

if env['openmp']:
if 'clang++' in cpp_compiler:
print "Clang does not support OpenMP. Use scheduler=cpp."
print( "Clang does not support OpenMP. Use scheduler=cpp.")
Exit(1)

env.Append(CPPDEFINES = [('ARM_COMPUTE_OPENMP_SCHEDULER', 1)])
Expand Down Expand Up @@ -179,10 +179,10 @@ if not GetOption("help"):

if 'clang++' not in cpp_compiler:
if env['arch'] == 'arm64-v8.2-a' and not version_at_least(compiler_ver, '6.2.1'):
print "GCC 6.2.1 or newer is required to compile armv8.2-a code"
print("GCC 6.2.1 or newer is required to compile armv8.2-a code")
Exit(1)
elif env['arch'] == 'arm64-v8a' and not version_at_least(compiler_ver, '4.9'):
print "GCC 4.9 or newer is required to compile NEON code for AArch64"
print("GCC 4.9 or newer is required to compile NEON code for AArch64")
Exit(1)

if version_at_least(compiler_ver, '6.1'):
Expand Down
6 changes: 3 additions & 3 deletions include/half/half.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ namespace half_float
/// ~~~~
namespace literal
{
half operator""_h(long double);
half operator"" _h(long double);
}
#endif

Expand Down Expand Up @@ -1083,7 +1083,7 @@ namespace half_float
friend struct std::hash<half>;
#endif
#if HALF_ENABLE_CPP11_USER_LITERALS
friend half literal::operator""_h(long double);
friend half literal::operator"" _h(long double);
#endif

public:
Expand Down Expand Up @@ -1196,7 +1196,7 @@ namespace half_float
/// to rather involved conversions.
/// \param value literal value
/// \return half with given value (if representable)
inline half operator""_h(long double value) { return half(detail::binary, detail::float2half<half::round_style>(value)); }
inline half operator"" _h(long double value) { return half(detail::binary, detail::float2half<half::round_style>(value)); }
}
#endif

Expand Down

0 comments on commit e2542c9

Please sign in to comment.