diff options
author | Dmitry Kovalev <dkovalev@google.com> | 2013-10-25 10:58:09 -0700 |
---|---|---|
committer | Dmitry Kovalev <dkovalev@google.com> | 2013-10-25 10:58:09 -0700 |
commit | 9f528ce057e0945abd8382f551119dc2e20bfcc5 (patch) | |
tree | 59f6a807c4e61399b54803a7bc42f089cb724969 /third_party/googletest/src/samples/sample4.cc | |
parent | 47665452f0da3c11427ecb4852535e1787bb0c5b (diff) | |
download | libvpx-9f528ce057e0945abd8382f551119dc2e20bfcc5.tar libvpx-9f528ce057e0945abd8382f551119dc2e20bfcc5.tar.gz libvpx-9f528ce057e0945abd8382f551119dc2e20bfcc5.tar.bz2 libvpx-9f528ce057e0945abd8382f551119dc2e20bfcc5.zip |
Updating gtest from 1.6.0 to 1.7.0.
This is required in order to build libvpx on OS X Mavericks where gcc
compiler is deleted, clang (3.3) is the default now.
Using unmodified source files from gtest-1.7.0/fused-src folder.
Change-Id: I3d5f7278149c904e48737327daf7097a8bb0b390
Diffstat (limited to 'third_party/googletest/src/samples/sample4.cc')
-rw-r--r-- | third_party/googletest/src/samples/sample4.cc | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/third_party/googletest/src/samples/sample4.cc b/third_party/googletest/src/samples/sample4.cc deleted file mode 100644 index ae44bda6f..000000000 --- a/third_party/googletest/src/samples/sample4.cc +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright 2005, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// 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. - -// A sample program demonstrating using Google C++ testing framework. -// -// Author: wan@google.com (Zhanyong Wan) - -#include <stdio.h> - -#include "sample4.h" - -// Returns the current counter value, and increments it. -int Counter::Increment() { - return counter_++; -} - -// Prints the current counter value to STDOUT. -void Counter::Print() const { - printf("%d", counter_); -} |