Skip to content

Commit 31faa9a

Browse files
committed
Update for v33
1 parent 17edd13 commit 31faa9a

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ include(CheckCXXCompilerFlag)
88

99
write_basic_package_version_file(
1010
"${CMAKE_CURRENT_BINARY_DIR}/trompeloeil/trompeloeil-config-version.cmake"
11-
VERSION 32
11+
VERSION 33
1212
COMPATIBILITY AnyNewerVersion)
1313

1414
if (CXX_STANDARD MATCHES "11")

ChangeLog

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
v33 2019-01-21
2+
13
* Silenced noisy g++-7 -Wuseless-cast warning
24

35
* Fixed a bug where a mocked function would not compile if a parameter

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CI: [ ![Build Status](https://travis-ci.org/rollbear/trompeloeil.svg?branch=mast
88
https://ci.appveyor.com/project/rollbear/trompeloeil)
99
[![Coverage Status](https://coveralls.io/repos/rollbear/trompeloeil/badge.svg?branch=master&service=github)](https://coveralls.io/github/rollbear/trompeloeil?branch=master)
1010

11-
[conan.io](https://conan.io) [ ![Download](https://api.bintray.com/packages/trompeloeil/trompeloeil/trompeloeil%3Arollbear/images/download.svg?version=v32%3Astable) ](https://bintray.com/trompeloeil/trompeloeil/trompeloeil%3Arollbear/v32%3Astable/link)
11+
[conan.io](https://conan.io) [ ![Download](https://api.bintray.com/packages/trompeloeil/trompeloeil/trompeloeil%3Arollbear/images/download.svg?version=v33%3Astable) ](https://bintray.com/trompeloeil/trompeloeil/trompeloeil%3Arollbear/v33%3Astable/link)
1212

1313
[![HitCount](http://hits.dwyl.io/rollbear/trompeloeil.svg)](http://hits.dwyl.io/rollbear/trompeloeil)
1414

conanfile.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Trompeloeil C++ mocking framework
33
#
4-
# Copyright Bjorn Fahller 2017
4+
# Copyright Bjorn Fahller 2017-2019
55
#
66
# Use, modification and distribution is subject to the
77
# Boost Software License, Version 1.0. (See accompanying
@@ -16,7 +16,7 @@
1616

1717
class TrompeloelConan(ConanFile):
1818
name = "trompeloeil"
19-
version = "v32"
19+
version = "v33"
2020
license = "Boost Software License - Version 1.0 - August 17th, 2003"
2121
url = "https://github.com/rollbear/trompeloeil.git"
2222
description = "Header only C++14 mocking framework"

0 commit comments

Comments
 (0)