diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-15 13:02:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-15 13:02:54 -0700 |
| commit | 1246e5807a94081049285e8fda4309f67ef571b4 (patch) | |
| tree | f2008a506ed390eb94da65cb8a0dc9351b7efb9b /googlemock/src/gmock-internal-utils.cc | |
| parent | 4b6a7a49ab63f609630ce58c18a39c4048ab3ad5 (diff) | |
| parent | 2172c08c9241ab0cc8857980bbe925fe1a55cf3c (diff) | |
| download | googletest-1246e5807a94081049285e8fda4309f67ef571b4.tar.gz googletest-1246e5807a94081049285e8fda4309f67ef571b4.tar.bz2 googletest-1246e5807a94081049285e8fda4309f67ef571b4.zip | |
Merge branch 'master' into cleanup-cmake
Diffstat (limited to 'googlemock/src/gmock-internal-utils.cc')
| -rw-r--r-- | googlemock/src/gmock-internal-utils.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/googlemock/src/gmock-internal-utils.cc b/googlemock/src/gmock-internal-utils.cc index 20c5a8db..e3a67485 100644 --- a/googlemock/src/gmock-internal-utils.cc +++ b/googlemock/src/gmock-internal-utils.cc @@ -26,8 +26,7 @@ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) + // Google Mock - a framework for writing C++ mock classes. // @@ -188,7 +187,9 @@ GTEST_API_ void Log(LogSeverity severity, const std::string& message, std::cout << ::std::flush; } -void IllegalDoDefault(const char* file, int line) { +GTEST_API_ WithoutMatchers GetWithoutMatchers() { return WithoutMatchers(); } + +GTEST_API_ void IllegalDoDefault(const char* file, int line) { internal::Assert( false, file, line, "You are using DoDefault() inside a composite action like " |