diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-17 11:48:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-17 11:48:56 -0400 |
| commit | a9bd428e72a11a3a36bb7a8755cf2d58b1ce8e9d (patch) | |
| tree | 32d0dac55ff598f9732ff57581044eabd24fa807 /googlemock/include/gmock/gmock-actions.h | |
| parent | 421e7b4f29fc761c66d2773a1fc318a738a6d3da (diff) | |
| parent | 02a8ca87735601466d8c564344f9be493da84708 (diff) | |
| download | googletest-a9bd428e72a11a3a36bb7a8755cf2d58b1ce8e9d.tar.gz googletest-a9bd428e72a11a3a36bb7a8755cf2d58b1ce8e9d.tar.bz2 googletest-a9bd428e72a11a3a36bb7a8755cf2d58b1ce8e9d.zip | |
Merge branch 'master' into fix-msvc-d9025-warning
Diffstat (limited to 'googlemock/include/gmock/gmock-actions.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-actions.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/googlemock/include/gmock/gmock-actions.h b/googlemock/include/gmock/gmock-actions.h index a2784f63..b82313d5 100644 --- a/googlemock/include/gmock/gmock-actions.h +++ b/googlemock/include/gmock/gmock-actions.h @@ -26,13 +26,14 @@ // 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. // // This file implements some commonly used actions. +// GOOGLETEST_CM0002 DO NOT DELETE + #ifndef GMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_ #define GMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_ |