From c0b71da135affd162153b048075d5732a034bf46 Mon Sep 17 00:00:00 2001 From: "James E. King III" Date: Fri, 19 Apr 2019 06:53:52 -0400 Subject: [PATCH] Update CI Scripts --- .travis.yml | 167 +++++++++++------- appveyor.yml | 84 +++++---- example/gregorian/find_last_day_of_months.cpp | 4 +- example/local_time/seconds_since_epoch.cpp | 4 +- test/gregorian/testdate_input_facet.cpp | 4 +- 5 files changed, 165 insertions(+), 98 deletions(-) diff --git a/.travis.yml b/.travis.yml index 838e8ede3..6fc7c85d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,14 @@ # Copyright 2016 Peter Dimov -# Copyright 2017, 2018 James E. King III +# Copyright 2017 - 2019 James E. King III # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt) # # Generic Travis CI build script for boostorg repositories -# See: https://github.com/jeking3/boost-ci +# See: https://github.com/boostorg/boost-ci # # Instructions for customizing this script for your library: -# +# # 1. Customize the compilers and language levels you want in the 'jobs'. # 2. If you have more than include/, src/, test/, example/, examples/, or # tools/ directories, modify your Travis CI project and add the environment @@ -22,21 +22,19 @@ # # That's it - the scripts will do everything else for you. -sudo: false -dist: trusty +dist: xenial language: cpp env: global: # see: http://www.boost.org/build/doc/html/bbv2/overview/invocation.html#bbv2.overview.invocation.properties - # to use the default for a given environment, comment it out; recommend you build debug and release however.. # - B2_ADDRESS_MODEL=address-model=64,32 # - B2_LINK=link=shared,static # - B2_THREADING=threading=multi,single - - B2_VARIANT=variant=release,debug + - B2_VARIANT=variant=release install: - - git clone https://github.com/jeking3/boost-ci.git boost-ci + - git clone https://github.com/boostorg/boost-ci.git boost-ci - cp -pr boost-ci/ci boost-ci/.codecov.yml . - source ci/travis/install.sh @@ -46,12 +44,16 @@ addons: - binutils-gold - gdb - libc6-dbg - + branches: only: - - develop - master - + - develop + - /bugfix\/.*/ + - /feature\/.*/ + - /fix\/.*/ + - /pr\/.*/ + script: - cd $BOOST_ROOT/libs/$SELF - ci/travis/build.sh @@ -67,95 +69,143 @@ script: # anchors: - clang-34: &clang-34 { apt: { packages: [ "clang-3.4" ], sources: [ "llvm-toolchain-trusty-3.4" ] } } clang-38: &clang-38 { apt: { packages: [ "clang-3.8", - "libstdc++-6-dev" ], sources: [ "llvm-toolchain-trusty-3.8", + "libstdc++-6-dev" ], sources: [ "llvm-toolchain-xenial-3.8", "ubuntu-toolchain-r-test" ] } } clang-4: &clang-4 { apt: { packages: [ "clang-4.0", - "libstdc++-6-dev" ], sources: [ "llvm-toolchain-trusty-4.0", + "libstdc++-6-dev" ], sources: [ "llvm-toolchain-xenial-4.0", "ubuntu-toolchain-r-test" ] } } clang-5: &clang-5 { apt: { packages: [ "clang-5.0", - "libstdc++-7-dev" ], sources: [ "llvm-toolchain-trusty-5.0", + "libstdc++-7-dev" ], sources: [ "llvm-toolchain-xenial-5.0", "ubuntu-toolchain-r-test" ] } } clang-6: &clang-6 { apt: { packages: [ "clang-6.0", + "libc6-dbg", + "libc++-dev", + "libstdc++-8-dev" ], sources: [ "llvm-toolchain-xenial-6.0", + "ubuntu-toolchain-r-test" ] } } + clang-7: &clang-7 { apt: { packages: [ "clang-7", + "libc6-dbg", "libc++-dev", - "libstdc++-8-dev", - "valgrind" ], sources: [ "llvm-toolchain-trusty-6.0", + "libstdc++-8-dev" ], sources: [ "llvm-toolchain-xenial-7", "ubuntu-toolchain-r-test" ] } } - gcc-44: &gcc-44 { apt: { packages: [ "g++-4.4" ], sources: [ "ubuntu-toolchain-r-test" ] } } - gcc-46: &gcc-46 { apt: { packages: [ "g++-4.6" ], sources: [ "ubuntu-toolchain-r-test" ] } } - gcc-48: &gcc-48 { apt: { packages: [ "g++-4.8" ], sources: [ "ubuntu-toolchain-r-test" ] } } - gcc-5: &gcc-5 { apt: { packages: [ "g++-5" ], sources: [ "ubuntu-toolchain-r-test" ] } } + clang-8: &clang-8 { apt: { packages: [ "clang-8", + "libc6-dbg", + "libc++-dev", + "libstdc++-8-dev" ], sources: [ "llvm-toolchain-xenial-8", + "ubuntu-toolchain-r-test" ] } } + gcc-48: &gcc-48 { apt: { packages: [ "g++-4.8" ] } } + gcc-49: &gcc-49 { apt: { packages: [ "g++-4.9" ], sources: [ "ubuntu-toolchain-r-test" ] } } + gcc-5: &gcc-5 { apt: { packages: [ "g++-5" ] } } gcc-6: &gcc-6 { apt: { packages: [ "g++-6" ], sources: [ "ubuntu-toolchain-r-test" ] } } gcc-7: &gcc-7 { apt: { packages: [ "g++-7" ], sources: [ "ubuntu-toolchain-r-test" ] } } gcc-8: &gcc-8 { apt: { packages: [ "g++-8" ], sources: [ "ubuntu-toolchain-r-test" ] } } + gcc-9: &gcc-9 { apt: { packages: [ "g++-9" ], sources: [ "ubuntu-toolchain-r-test" ] } } jobs: allow_failures: + # https://github.com/boostorg/date_time/issues/111 - env: - - COPY="all the environment settings from your job" + - COMMENT=ubsan + - B2_VARIANT=variant=debug + - B2_TOOLSET=gcc-8 + - B2_CXXSTD=03,11,14 + - B2_CXXFLAGS="undefined-sanitizer=norecover" + - B2_DEFINES="define=BOOST_NO_STRESS_TEST=1" + - B2_LINKFLAGS="linkflags=-fuse-ld=gold" + - UBSAN_OPTIONS=print_stacktrace=1 include: # libstdc++ - - { os: "linux", env: [ "TOOLSET=gcc-4.4", "CXXSTD=98,0x" ], addons: *gcc-44 } - - { os: "linux", env: [ "TOOLSET=gcc-4.6", "CXXSTD=03,0x" ], addons: *gcc-46 } - - { os: "linux", env: [ "TOOLSET=gcc-4.8", "CXXSTD=03,11" ], addons: *gcc-48 } - - { os: "linux", env: [ "TOOLSET=gcc-5", "CXXSTD=03,11" ], addons: *gcc-5 } - - { os: "linux", env: [ "TOOLSET=gcc-6", "CXXSTD=03,11,14" ], addons: *gcc-6 } - - { os: "linux", env: [ "TOOLSET=gcc-7", "CXXSTD=03,11,14,17" ], addons: *gcc-7 } - - { os: "linux", env: [ "TOOLSET=gcc-8", "CXXSTD=03,11,14,17,2a" ], addons: *gcc-8 } - - { os: "linux", env: [ "TOOLSET=clang-3.4", "CXXSTD=03,11" ], addons: *clang-34 } - - { os: "linux", env: [ "TOOLSET=clang-3.8", "CXXSTD=03,11,14" ], addons: *clang-38 } - - { os: "linux", env: [ "TOOLSET=clang-4.0", "CXXSTD=03,11,14" ], addons: *clang-4 } - - { os: "linux", env: [ "TOOLSET=clang-5.0", "CXXSTD=03,11,14,17" ], addons: *clang-5 } - - { os: "linux", env: [ "TOOLSET=clang-6.0", "CXXSTD=03,11,14,17,2a" ], addons: *clang-6 } + - { os: "linux", dist: "trusty", # xenial has libstdc++ from gcc 5.4.0 with newer ABI + env: [ "B2_TOOLSET=gcc-4.8", "B2_CXXSTD=03,11" ], addons: *gcc-48 } + - { os: "linux", dist: "trusty", # xenial has libstdc++ from gcc 5.4.0 with newer ABI + env: [ "B2_TOOLSET=gcc-4.9", "B2_CXXSTD=03,11" ], addons: *gcc-49 } + - { os: "linux", env: [ "B2_TOOLSET=gcc-5", "B2_CXXSTD=03,11" ], addons: *gcc-5 } + - { os: "linux", env: [ "B2_TOOLSET=gcc-6", "B2_CXXSTD=11,14" ], addons: *gcc-6 } + - { os: "linux", env: [ "B2_TOOLSET=gcc-7", "B2_CXXSTD=14,17" ], addons: *gcc-7 } + - { os: "linux", env: [ "B2_TOOLSET=gcc-8", "B2_CXXSTD=17,2a" ], addons: *gcc-8 } + - { os: "linux", env: [ "B2_TOOLSET=gcc-9", "B2_CXXSTD=17,2a" ], addons: *gcc-9 } + - { os: "linux", dist: "trusty", # xenial has libstdc++ from gcc 5.4.0 with newer ABI + env: [ "B2_TOOLSET=clang-3.8", "B2_CXXSTD=03,11" ], addons: *clang-38 } + - { os: "linux", env: [ "B2_TOOLSET=clang-4.0", "B2_CXXSTD=11,14" ], addons: *clang-4 } + - { os: "linux", env: [ "B2_TOOLSET=clang-5.0", "B2_CXXSTD=11,14" ], addons: *clang-5 } + - { os: "linux", env: [ "B2_TOOLSET=clang-6.0", "B2_CXXSTD=14,17" ], addons: *clang-6 } + - { os: "linux", env: [ "B2_TOOLSET=clang-7", "B2_CXXSTD=17,2a" ], addons: *clang-7 } + - { os: "linux", env: [ "B2_TOOLSET=clang-8", "B2_CXXSTD=17,2a" ], addons: *clang-8 } + # libc++ - - { os: "linux", env: [ "TOOLSET=clang-6.0", "CXXSTD=03,11,14,17,2a", - "CXXFLAGS=-stdlib=libc++" ], addons: *clang-6 } - # the rvm environment on osx is taking over basic commands like "cd" and breaking things! - # - { os: "osx" , env: [ "COMMENT=libc++", - # "TOOLSET=clang", "CXXSTD=03,11,14" ] } + - { os: "linux", env: [ "B2_TOOLSET=clang-6.0", "B2_CXXSTD=03,11,14", + "B2_CXXFLAGS=-stdlib=libc++" ], addons: *clang-6 } + - { os: "osx" , env: [ "B2_TOOLSET=clang", "B2_CXXSTD=03,11,17" ] } + + # to enable Intel ICC define INTEL_ICC_SERIAL_NUMBER and the following: + # - { os: "linux", env: [ "B2_TOOLSET=intel-linux", "B2_CXXSTD=11,14,17" ], addons: *gcc-7, + # script: cd $BOOST_ROOT/libs/$SELF && ci/travis/intelicc.sh } - os: linux - env: + env: - COMMENT=codecov.io - - TOOLSET=gcc-7 - - DEFINES="define=BOOST_NO_STRESS_TEST=1" - addons: *gcc-7 + - B2_CXXSTD=03,11 + - B2_TOOLSET=gcc-8 + - B2_DEFINES="define=BOOST_NO_STRESS_TEST=1" + addons: *gcc-8 script: - - pushd /tmp && git clone https://github.com/linux-test-project/lcov.git && export PATH=/tmp/lcov/bin:$PATH && which lcov && lcov --version && popd - cd $BOOST_ROOT/libs/$SELF - ci/travis/codecov.sh - os: linux env: - - COMMENT=cppcheck - script: - - cd $BOOST_ROOT/libs/$SELF - - ci/travis/cppcheck.sh + - COMMENT=asan + - B2_VARIANT=variant=debug + - B2_TOOLSET=gcc-8 + - B2_CXXSTD=03,11,14 + - B2_CXXFLAGS="address-sanitizer=norecover" + - B2_DEFINES="define=BOOST_NO_STRESS_TEST=1" + addons: *gcc-8 + + - os: linux + env: + - COMMENT=tsan + - B2_VARIANT=variant=debug + - B2_TOOLSET=gcc-8 + - B2_CXXSTD=03,11,14 + - B2_CXXFLAGS="thread-sanitizer=norecover" + - B2_DEFINES="define=BOOST_NO_STRESS_TEST=1" + addons: *gcc-8 - os: linux env: - COMMENT=ubsan - B2_VARIANT=variant=debug - - TOOLSET=gcc-8 - - CXXSTD=03,11,14,17,2a - - DEFINES="define=BOOST_NO_STRESS_TEST=1" - - CXXFLAGS="cxxflags=-fno-omit-frame-pointer cxxflags=-fsanitize=undefined cxxflags=-fno-sanitize-recover=undefined" - - LINKFLAGS="linkflags=-fsanitize=undefined linkflags=-fno-sanitize-recover=undefined linkflags=-fuse-ld=gold" + - B2_TOOLSET=gcc-8 + - B2_CXXSTD=03,11,14 + - B2_CXXFLAGS="undefined-sanitizer=norecover" + - B2_DEFINES="define=BOOST_NO_STRESS_TEST=1" + # https://github.com/boostorg/build/issues/451 using the gold linker to work around an issue + - B2_LINKFLAGS="linkflags=-fuse-ld=gold" - UBSAN_OPTIONS=print_stacktrace=1 addons: *gcc-8 - os: linux env: - COMMENT=valgrind - - TOOLSET=clang-6.0 - - CXXSTD=03,11,14,17,2a - - DEFINES="define=BOOST_NO_STRESS_TEST=1" + - B2_TOOLSET=clang-6.0 + - B2_CXXSTD=03,11,14 + - B2_DEFINES="define=BOOST_NO_STRESS_TEST=1" - B2_VARIANT=variant=debug - - TESTFLAGS=testing.launcher=valgrind + - B2_TESTFLAGS=testing.launcher=valgrind - VALGRIND_OPTS=--error-exitcode=1 addons: *clang-6 + script: + - cd $BOOST_ROOT/libs/$SELF + - ci/travis/valgrind.sh + + # - os: linux + # env: + # - COMMENT=cppcheck + # script: + # - cd $BOOST_ROOT/libs/$SELF + # - ci/travis/cppcheck.sh #################### Jobs to run on pushes to master, develop ################### @@ -164,8 +214,7 @@ jobs: if: (env(COVERITY_SCAN_NOTIFICATION_EMAIL) IS present) AND (branch IN (develop, master)) AND (type IN (cron, push)) env: - COMMENT="Coverity Scan" - - TOOLSET=gcc-7 - addons: *gcc-7 + - B2_TOOLSET=clang script: - cd $BOOST_ROOT/libs/$SELF - ci/travis/coverity.sh diff --git a/appveyor.yml b/appveyor.yml index afcb1794c..01985bde8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,16 +1,16 @@ # Copyright 2016, 2017 Peter Dimov -# Copyright (C) 2017, 2018 James E. King III +# Copyright (C) 2017 - 2019 James E. King III # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt) # # Generic Appveyor build script for boostorg repositories -# See: https://github.com/jeking3/boost-ci/ +# See: https://github.com/boostorg/boost-ci/ # # Instructions for customizing this script for your library: # # 1. Customize the compilers and language levels you want. -# 2. If you have move than include/, src/, test/, example/, examples/, +# 2. If you have more than include/, src/, test/, example/, examples/, # benchmark/ or tools/ directories, set the environment variable DEPINST. # For example if your build uses code in "bench/" and "fog/" directories: # - DEPINST: --include bench --include fog @@ -25,8 +25,12 @@ shallow_clone: true branches: only: - - develop - master + - develop + - /bugfix\/.*/ + - /feature\/.*/ + - /fix\/.*/ + - /pr\/.*/ matrix: # Adding MAYFAIL to any matrix job allows it to fail but the build stays green: @@ -42,76 +46,91 @@ environment: # B2_ADDRESS_MODEL: address-model=64,32 # B2_LINK: link=shared,static # B2_THREADING: threading=multi,single - B2_VARIANT: variant=release,debug + B2_VARIANT: variant=release matrix: + - FLAVOR: Visual Studio 2019 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + B2_ADDRESS_MODEL: address-model=64 + B2_CXXFLAGS: cxxflags=-permissive- + B2_CXXSTD: latest # 2a + B2_TOOLSET: msvc-14.2 + - FLAVOR: Visual Studio 2017 C++2a Strict APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - TOOLSET: msvc-14.1 B2_ADDRESS_MODEL: address-model=64 - CXXFLAGS: cxxflags=-permissive- - CXXSTD: latest # 2a + B2_CXXFLAGS: cxxflags=-permissive- + B2_CXXSTD: latest # 2a + B2_TOOLSET: msvc-14.1 - FLAVOR: Visual Studio 2017 C++17 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - TOOLSET: msvc-14.1 B2_ADDRESS_MODEL: address-model=64 - CXXSTD: 17 + B2_CXXSTD: 17 + B2_TOOLSET: msvc-14.1 + B2_VARIANT: variant=debug - FLAVOR: Visual Studio 2017 C++14 (Default) APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - TOOLSET: msvc-14.1 B2_ADDRESS_MODEL: address-model=64,32 + B2_TOOLSET: msvc-14.1 + + - FLAVOR: clang-cl + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + B2_ADDRESS_MODEL: address-model=64 + B2_CXXSTD: 11 + B2_TOOLSET: clang-win - FLAVOR: Visual Studio 2015 C++14 (Default) APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - TOOLSET: msvc-14.0 B2_ADDRESS_MODEL: address-model=64,32 + B2_TOOLSET: msvc-14.0 + B2_VARIANT: variant=debug - FLAVOR: Visual Studio 2010, 2012, 2013 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - TOOLSET: msvc-10.0,msvc-11.0,msvc-12.0 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + B2_TOOLSET: msvc-10.0,msvc-11.0,msvc-12.0 - FLAVOR: cygwin (32-bit) APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 ADDPATH: C:\cygwin\bin; B2_ADDRESS_MODEL: address-model=32 - CXXSTD: 03,11 + B2_CXXSTD: 03,11 # https://github.com/boostorg/test/issues/144 - DEFINES: define=_POSIX_C_SOURCE=200112L define=_GLIBCXX_USE_CXX11_ABI=1 - THREADING: threadapi=pthread - CYGWIN_UPDATE: true - TOOLSET: gcc + B2_DEFINES: define=_POSIX_C_SOURCE=200112L + B2_THREADING: threadapi=pthread + B2_TOOLSET: gcc + B2_VARIANT: variant=debug - FLAVOR: cygwin (64-bit) APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 ADDPATH: C:\cygwin64\bin; B2_ADDRESS_MODEL: address-model=64 - CXXSTD: 11,17 + B2_CXXSTD: 11,17 # https://github.com/boostorg/test/issues/144 - DEFINES: define=_POSIX_C_SOURCE=200112L define=__USE_ISOC99 define=_GLIBCXX_USE_CXX11_ABI=1 - THREADING: threadapi=pthread - CYGWIN_UPDATE: true - TOOLSET: gcc + B2_DEFINES: define=_POSIX_C_SOURCE=200112L define=__USE_ISOC99 + B2_THREADING: threadapi=pthread + B2_TOOLSET: gcc - FLAVOR: mingw32 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 ARCH: i686 B2_ADDRESS_MODEL: address-model=32 - CXXSTD: 03,11 + B2_CXXSTD: 03,11 SCRIPT: ci\appveyor\mingw.bat + B2_VARIANT: variant=debug - FLAVOR: mingw64 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 ARCH: x86_64 B2_ADDRESS_MODEL: address-model=64 - CXXSTD: 11,17 - DEFINES: define=__USE_ISOC99 + B2_CXXSTD: 11,17 + B2_DEFINES: define=__USE_ISOC99 SCRIPT: ci\appveyor\mingw.bat install: - set SELF=%APPVEYOR_PROJECT_NAME:-=_% - - git clone https://github.com/jeking3/boost-ci.git C:\boost-ci + - git clone https://github.com/boostorg/boost-ci.git C:\boost-ci - xcopy /s /e /q /i C:\boost-ci\ci .\ci - ci\appveyor\install.bat @@ -120,10 +139,9 @@ build: off test_script: - set SELF=%APPVEYOR_PROJECT_NAME:-=_% - PATH=%ADDPATH%%PATH% - - IF DEFINED CYGWIN_UPDATE (call libs\%SELF%\ci\appveyor\cygwin-update.bat) - # The definition of TOOLCXX omits CXXSTD= if it was not defined above - - IF NOT DEFINED CXXSTD (SET TOOLCXX=toolset=%TOOLSET%) ELSE (SET TOOLCXX=toolset=%TOOLSET% cxxstd=%CXXSTD%) + # The definition of B2_TOOLCXX omits B2_CXXSTD= if it was not defined above + - IF NOT DEFINED B2_CXXSTD (SET B2_TOOLCXX=toolset=%B2_TOOLSET%) ELSE (SET B2_TOOLCXX=toolset=%B2_TOOLSET% cxxstd=%B2_CXXSTD%) # Echo the complete build command to the build log - - IF NOT DEFINED SCRIPT (ECHO b2 libs/%SELF:\=/% %TOOLCXX% %CXXFLAGS% %DEFINES% %THREADING% %B2_ADDRESS_MODEL% %B2_LINK% %B2_THREADING% %B2_VARIANT% -j3) + - IF NOT DEFINED SCRIPT (ECHO b2 libs/%SELF:\=/% %B2_TOOLCXX% %B2_CXXFLAGS% %B2_DEFINES% %B2_THREADING% %B2_ADDRESS_MODEL% %B2_LINK% %B2_THREADING% %B2_VARIANT% -j3) # Now go build... - - IF DEFINED SCRIPT (call libs\%SELF%\%SCRIPT%) ELSE (b2 libs/%SELF:\=/% %TOOLCXX% %CXXFLAGS% %DEFINES% %THREADING% %B2_ADDRESS_MODEL% %B2_LINK% %B2_THREADING% %B2_VARIANT% -j3) + - IF DEFINED SCRIPT (call libs\%SELF%\%SCRIPT%) ELSE (b2 libs/%SELF:\=/% %B2_TOOLCXX% %B2_CXXFLAGS% %B2_DEFINES% %B2_THREADING% %B2_ADDRESS_MODEL% %B2_LINK% %B2_THREADING% %B2_VARIANT% -j3) diff --git a/example/gregorian/find_last_day_of_months.cpp b/example/gregorian/find_last_day_of_months.cpp index 9e59f208d..b0c3640be 100644 --- a/example/gregorian/find_last_day_of_months.cpp +++ b/example/gregorian/find_last_day_of_months.cpp @@ -24,11 +24,11 @@ main() std::cin >> m; month = greg_month(m); } - catch(bad_year by) { + catch(const bad_year& by) { std::cout << "Invalid Year Entered: " << by.what() << '\n' << "Using minimum values for month and year." << std::endl; } - catch(bad_month bm) { + catch(const bad_month& bm) { std::cout << "Invalid Month Entered" << bm.what() << '\n' << "Using minimum value for month. " << std::endl; } diff --git a/example/local_time/seconds_since_epoch.cpp b/example/local_time/seconds_since_epoch.cpp index 7de79517c..decaf33bb 100644 --- a/example/local_time/seconds_since_epoch.cpp +++ b/example/local_time/seconds_since_epoch.cpp @@ -24,10 +24,10 @@ int main() tz_database tz_db; try { tz_db.load_from_file("../data/date_time_zonespec.csv"); - }catch(data_not_accessible dna) { + }catch(const data_not_accessible& dna) { std::cerr << "Error with time zone data file: " << dna.what() << std::endl; exit(EXIT_FAILURE); - }catch(bad_field_count bfc) { + }catch(const bad_field_count& bfc) { std::cerr << "Error with time zone data file: " << bfc.what() << std::endl; exit(EXIT_FAILURE); } diff --git a/test/gregorian/testdate_input_facet.cpp b/test/gregorian/testdate_input_facet.cpp index c52caa744..d0b9c19cc 100644 --- a/test/gregorian/testdate_input_facet.cpp +++ b/test/gregorian/testdate_input_facet.cpp @@ -77,8 +77,8 @@ int main(){ std::stringstream ss("Mar."); std::istreambuf_iterator sitr(ss), str_end; - date_input_facet* f = new date_input_facet(); - f->get(sitr, str_end, ss, m); + date_input_facet f; + f.get(sitr, str_end, ss, m); check("No extra characters consumed", m == greg_month(Mar) && *sitr == '.'); }