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/internal/gtest-tuple.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/internal/gtest-tuple.h')
| -rw-r--r-- | test/googletest/include/gtest/internal/gtest-tuple.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/googletest/include/gtest/internal/gtest-tuple.h b/test/googletest/include/gtest/internal/gtest-tuple.h index e9b40534..78a3a6a0 100644 --- a/test/googletest/include/gtest/internal/gtest-tuple.h +++ b/test/googletest/include/gtest/internal/gtest-tuple.h @@ -30,11 +30,12 @@ // 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) + // Implements a subset of TR1 tuple needed by Google Test and Google Mock. +// GOOGLETEST_CM0001 DO NOT DELETE + #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_ #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_ @@ -42,7 +43,7 @@ // The compiler used in Symbian has a bug that prevents us from declaring the // tuple template as a friend (it complains that tuple is redefined). This -// hack bypasses the bug by declaring the members that should otherwise be +// bypasses the bug by declaring the members that should otherwise be // private as public. // Sun Studio versions < 12 also have the above bug. #if defined(__SYMBIAN32__) || (defined(__SUNPRO_CC) && __SUNPRO_CC < 0x590) |