Skip to content

Commit cc65c5b

Browse files
committed
Merge pull request #435 from kylelutz/travis-gcc48
Use gcc-4.8 on Travis-CI
2 parents a1a7814 + 78db09b commit cc65c5b

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ before_install:
77
- sudo apt-get update -qq
88
- sudo apt-get install -qq fglrx=2:8.960-0ubuntu1 opencl-headers libboost-chrono1.48-dev libboost-date-time1.48-dev libboost-test1.48-dev libboost-system1.48-dev libboost-filesystem1.48-dev libboost-timer1.48-dev libboost-program-options1.48-dev libboost-thread1.48-dev python-yaml lcov libopencv-dev g++-4.8
99
- gem install coveralls-lcov
10+
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
1011
script:
1112
- mkdir -p build
1213
- cd build
1314
- cmake -DBOOST_COMPUTE_BUILD_TESTS=ON -DBOOST_COMPUTE_BUILD_EXAMPLES=ON -DBOOST_COMPUTE_BUILD_BENCHMARKS=ON -DBOOST_COMPUTE_USE_OFFLINE_CACHE=ON -DBOOST_COMPUTE_ENABLE_COVERAGE=ON -DBOOST_COMPUTE_HAVE_OPENCV=ON -DBOOST_COMPUTE_THREAD_SAFE=ON -DCMAKE_CXX_FLAGS="-Wall -pedantic -Werror -Wno-variadic-macros -Wno-long-long -Wno-shadow" ..
14-
- make -j8
15+
- make -j4
1516
- ./example/list_devices
1617
- ctest --output-on-failure
1718
- ctest --output-on-failure

include/boost/compute/algorithm/reverse_copy.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ struct reverse_copy_kernel : public meta_kernel
2828
reverse_copy_kernel(Iterator first, Iterator last, OutputIterator result)
2929
: meta_kernel("reverse_copy")
3030
{
31-
typedef typename std::iterator_traits<Iterator>::value_type value_type;
32-
3331
// store size of the range
3432
m_size = detail::iterator_range_size(first, last);
3533
add_set_arg<const cl_uint>("size", static_cast<const cl_uint>(m_size));

0 commit comments

Comments
 (0)