perso
/
finalcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clang++ compile fix

This commit is contained in:
Markus Gans 2019-11-18 16:43:07 +01:00
parent 15fe47327e
commit cbe1179443
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -25,7 +25,6 @@ addons:
homebrew: homebrew:
packages: packages:
- autoconf-archive - autoconf-archive
update: true
env: env:
global: global:
@ -110,13 +109,12 @@ matrix:
# macOS # macOS
# #
- os: osx - os: osx
osx_image: xcode8 osx_image: xcode11
env: env:
- TEST="macOS" - TEST="macOS"
- MATRIX_EVAL="brew install gcc && CC=gcc-7 && CXX=g++-7"
before_install: before_install:
- eval "${MATRIX_EVAL}"
- uname -a - uname -a
- g++ --version
script: script:
- autoreconf -v --install --force - autoreconf -v --install --force
- ./configure --prefix=/usr - ./configure --prefix=/usr

4
src/fstring.cpp
View File

@ -779,7 +779,7 @@ FString& FString::setNumber (sInt64 num)
uInt64 abs_num = static_cast<uInt64>(num); uInt64 abs_num = static_cast<uInt64>(num);
if ( num < 0 ) if ( num < 0 )
abs_num = -num; abs_num = static_cast<uInt64>(-num);
*s = '\0'; *s = '\0';
@ -858,7 +858,7 @@ FString& FString::setFormatedNumber (sInt64 num, char separator)
separator = ' '; separator = ' ';
if ( num < 0 ) if ( num < 0 )
abs_num = -num; abs_num = static_cast<uInt64>(-num);
*s = L'\0'; *s = L'\0';

2
src/include/final/fstring.h
View File

@ -287,7 +287,7 @@ class FString
template <typename NumT template <typename NumT
, typename std::enable_if< std::is_integral<NumT>::value , typename std::enable_if< std::is_integral<NumT>::value
|| std::is_floating_point<NumT>::value || std::is_floating_point<NumT>::value
, int>::type = 0 > , int>::type >
inline FString& FString::operator << (const NumT val) inline FString& FString::operator << (const NumT val)
{ {
FString numstr(FString().setNumber(val)); FString numstr(FString().setNumber(val));