You are right. Only problem is that I was sure I did :-(


Arnd R. Strube
Software-Architect

Windhoff Software Services GmbH
Hofstraße 17, 48712 Gescher
Tel.: +49 (0) 25 42 / 95 59 44 | Fax: +49 (0) 25 42 / 95 59 20
a.strube@wind-soft.de | http://www.wind-soft.de



SAP BI – Aktuelle Themen in unserem Webcast
Kurz, prägnant und kostenlos | Gleich anmelden!

Standorte: Amberg | Berlin | Hamburg | Ingolstadt | Stuttgart | Wiesbaden | Wolfsburg

Geschäftsführung: Jürgen Kemp, Norbert Sundermann, Carsten Reinecke, Markus Brünen
Gesellschaftssitz: Gescher
Handelsregister: HRB 4486, 48651 Coesfeld



________________________________________
From: Bas Vodde [notifications@github.com]
Sent: Tuesday, June 18, 2013 02:02
To: cpputest/cpputest
Cc: Arnd Strube
Subject: Re: [cpputest] withParameter() separate overload / override (#123)

In src/CppUTestExt/MockFunctionCall.cpp:

> @@ -192,12 +200,6 @@ MockNamedValue MockFunctionCallComposite::returnValue()
>       return *this;
>  }
>
> -MockFunctionCall& MockIgnoredCall::instance()
> -{
> -    static MockIgnoredCall call;
> -    return call;
> -}
> -
>  MockFunctionCallTrace::MockFunctionCallTrace()


This was already integrated, right? They shouldn't be in this pull request then. You might want to merge your branch with the trunk and then this ought to disappear.

—
Reply to this email directly or view it on GitHub<https://github.com/cpputest/cpputest/pull/123/files#r4738520>.