diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2015-01-03 13:39:01 -0800 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2015-01-03 13:39:01 -0800 |
| commit | 0689b8424345cc305530deb7fa743335d282e103 (patch) | |
| tree | 4c12287e05d9abf9e17370d2dfc386d8ea4ad539 | |
| parent | 6bf7732916c9b1c936465f5ad57572dd4fb6554f (diff) | |
| download | tmwa-0689b8424345cc305530deb7fa743335d282e103.tar.gz tmwa-0689b8424345cc305530deb7fa743335d282e103.tar.bz2 tmwa-0689b8424345cc305530deb7fa743335d282e103.tar.xz tmwa-0689b8424345cc305530deb7fa743335d282e103.zip | |
Fix clang builds
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | include/tmwa/shared.hpp | 8 | ||||
| -rw-r--r-- | src/generic/dumb_ptr.hpp | 5 |
3 files changed, 7 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index dcd0932..794aa44 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ script: - mkdir build - cd build - git init - - ../configure --build=x86_64-linux-gnu --dev CPPFLAGS=-DQUIET `! [[ $CXX =~ clang* ]] || echo --disable-abi6 --disable-shared` $EXTRA_CONFIGURE_ARGS + - ../configure --build=x86_64-linux-gnu --dev CPPFLAGS=-DQUIET `! [[ $CXX =~ clang* ]] || echo --disable-abi6` $EXTRA_CONFIGURE_ARGS - make -R -k -j2 - make -R -k -j2 test TESTER='valgrind --error-exitcode=1 --track-fds=yes' @@ -78,8 +78,6 @@ matrix: allow_failures: - compiler: clang env: REAL_CC=clang-3.3 REAL_CXX=clang++-3.3 PPA=ppa:h-rayflood/llvm PACKAGE=clang-3.3 DEBUGPACKAGE=libstdc++6-4.6-dbg - - compiler: clang - env: REAL_CC=clang-3.5 REAL_CXX=clang++-3.5 PPA=ppa:h-rayflood/llvm PACKAGE=clang-3.5 DEBUGPACKAGE=libstdc++6-4.6-dbg exclude: - env: ignore=this include: diff --git a/include/tmwa/shared.hpp b/include/tmwa/shared.hpp index 8b6bfbc..95174ab 100644 --- a/include/tmwa/shared.hpp +++ b/include/tmwa/shared.hpp @@ -22,13 +22,9 @@ // TODO also make sure any exception classes are public -#ifndef __clang__ -# pragma GCC visibility push(default) -#endif +#pragma GCC visibility push(default) namespace tmwa { void check_paths(); } // namespace tmwa -#ifndef __clang__ -# pragma GCC visibility pop -#endif +#pragma GCC visibility pop diff --git a/src/generic/dumb_ptr.hpp b/src/generic/dumb_ptr.hpp index 72247d5..2ada93b 100644 --- a/src/generic/dumb_ptr.hpp +++ b/src/generic/dumb_ptr.hpp @@ -35,8 +35,11 @@ class dumb_ptr friend class dumb_ptr; T *impl; public: + dumb_ptr() noexcept + : impl(nullptr) + {} explicit - dumb_ptr(T *p=nullptr) noexcept + dumb_ptr(T *p) noexcept : impl(p) {} template<class U> |