Skip to content

Commit

Permalink
Disabled clang in travis. Version is too old
Browse files Browse the repository at this point in the history
  • Loading branch information
dirkvdb committed Nov 13, 2017
1 parent c26da9b commit bc2e270
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 18 deletions.
35 changes: 19 additions & 16 deletions .travis.yml
Expand Up @@ -28,22 +28,22 @@ matrix:
- libjpeg-dev
env:
- BUILD_TYPE=Release
- compiler: clang
addons:
apt:
packages:
- libpng-dev
- libjpeg-dev
env:
- BUILD_TYPE=Debug
- compiler: clang
addons:
apt:
packages:
- libpng-dev
- libjpeg-dev
env:
- BUILD_TYPE=Release
# - compiler: clang
# addons:
# apt:
# packages:
# - libpng-dev
# - libjpeg-dev
# env:
# - BUILD_TYPE=Debug
# - compiler: clang
# addons:
# apt:
# packages:
# - libpng-dev
# - libjpeg-dev
# env:
# - BUILD_TYPE=Release
- compiler: clang
os: osx
env:
Expand Down Expand Up @@ -71,6 +71,9 @@ before_install:
if [[ "${CXX}" == "g++" ]]; then
export CC=gcc-4.9
export CXX=g++-4.9
else
export CC=clang-4.9
export CXX=clang++-4.9
fi
fi
Expand Down
4 changes: 2 additions & 2 deletions libffmpegthumbnailer/moviedecoder.cpp
Expand Up @@ -268,9 +268,9 @@ std::string MovieDecoder::createScaleString(const std::string& sizeString, bool
width = std::stoi(sizeString);
}
}
catch (const std::regex_error& e)
catch (const std::regex_error&)
{
throw std::runtime_error("Failed to parse size string: " + std::string(e.what()));
throw std::runtime_error("Failed to parse size string");
}

std::stringstream scale;
Expand Down

0 comments on commit bc2e270

Please sign in to comment.