diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-03-24 20:45:54 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2019-03-24 20:45:54 +0100 |
| commit | 0afadbf9629345d571409c2ea3c25a6cd9cce14e (patch) | |
| tree | ad22e3659a33c951f3ba3f5533c3ac657270eec6 /test/googletest/include/gtest/gtest_pred_impl.h | |
| parent | 3e37b354194b4d42acd247c32ca97e45ac40af1e (diff) | |
| download | PROJ-0afadbf9629345d571409c2ea3c25a6cd9cce14e.tar.gz PROJ-0afadbf9629345d571409c2ea3c25a6cd9cce14e.zip | |
Update internal version of googletest to v1.8.1
This is already what is used by cmake builds
Diffstat (limited to 'test/googletest/include/gtest/gtest_pred_impl.h')
| -rw-r--r-- | test/googletest/include/gtest/gtest_pred_impl.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/test/googletest/include/gtest/gtest_pred_impl.h b/test/googletest/include/gtest/gtest_pred_impl.h index 30ae712f..0c1105cb 100644 --- a/test/googletest/include/gtest/gtest_pred_impl.h +++ b/test/googletest/include/gtest/gtest_pred_impl.h @@ -27,18 +27,19 @@ // (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. +// GOOGLETEST_CM0001 DO NOT DELETE + #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 +67,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 +354,6 @@ AssertionResult AssertPred5Helper(const char* pred_text, +} // namespace testing + #endif // GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_ |