diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-01-15 21:06:32 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-01-15 21:06:32 (GMT) |
| commit | da1f7fe1e7a54f2ecc6451b08053a29f735b4327 (patch) | |
| tree | b0c9291ebf9357944952f1a586a0ec1f2e06221e /googletest/include/gtest/gtest_pred_impl.h | |
| parent | 93b77987f59955e3a927c957a99cb8290b9f4990 (diff) | |
| download | googletest-da1f7fe1e7a54f2ecc6451b08053a29f735b4327.zip googletest-da1f7fe1e7a54f2ecc6451b08053a29f735b4327.tar.gz googletest-da1f7fe1e7a54f2ecc6451b08053a29f735b4327.tar.bz2 | |
Code merging
Diffstat (limited to 'googletest/include/gtest/gtest_pred_impl.h')
| -rw-r--r-- | googletest/include/gtest/gtest_pred_impl.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/googletest/include/gtest/gtest_pred_impl.h b/googletest/include/gtest/gtest_pred_impl.h index 30ae712..c8be230 100644 --- a/googletest/include/gtest/gtest_pred_impl.h +++ b/googletest/include/gtest/gtest_pred_impl.h @@ -27,7 +27,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// This file is AUTOMATICALLY GENERATED on 10/31/2011 by command +// This file is AUTOMATICALLY GENERATED on 01/02/2018 by command // 'gen_gtest_pred_impl.py 5'. DO NOT EDIT BY HAND! // // Implements a family of generic predicate assertion macros. @@ -35,10 +35,9 @@ #ifndef GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_ #define GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_ -// Makes sure this header is not included before gtest.h. -#ifndef GTEST_INCLUDE_GTEST_GTEST_H_ -# error Do not include gtest_pred_impl.h directly. Include gtest.h instead. -#endif // GTEST_INCLUDE_GTEST_GTEST_H_ +#include "gtest/gtest.h" + +namespace testing { // This header implements a family of generic predicate assertion // macros: @@ -66,8 +65,6 @@ // We also define the EXPECT_* variations. // // For now we only support predicates whose arity is at most 5. -// Please email googletestframework@googlegroups.com if you need -// support for higher arities. // GTEST_ASSERT_ is the basic statement to which all of the assertions // in this file reduce. Don't use this in your code. @@ -355,4 +352,6 @@ AssertionResult AssertPred5Helper(const char* pred_text, +} // namespace testing + #endif // GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_ |