On 12/12/2014 06:55 AM, Jose Fonseca wrote: > Series looks nice cleanup. > > I don't know of any need to keep support for older GCC neither. > > But I don't think it makes sense to mess with gtest -- it's better to > keep this in sync with upstream, and clobber with new upstream versions > when appropriate.
I was going to say exactly the same thing. Patches 1 through 7 are also Reviewed-by: Ian Romanick <ian.d.roman...@intel.com> > All other changes are > > Reviewed-By: Jose Fonseca <jfons...@vmware.com> > > Jose > > On 12/12/14 11:46, Timothy Arceri wrote: >> Signed-off-by: Timothy Arceri <t_arc...@yahoo.com.au> >> --- >> src/gtest/include/gtest/internal/gtest-port.h | 10 +++++----- >> 1 file changed, 5 insertions(+), 5 deletions(-) >> >> diff --git a/src/gtest/include/gtest/internal/gtest-port.h >> b/src/gtest/include/gtest/internal/gtest-port.h >> index dc4fe0c..70d3b25 100644 >> --- a/src/gtest/include/gtest/internal/gtest-port.h >> +++ b/src/gtest/include/gtest/internal/gtest-port.h >> @@ -517,8 +517,8 @@ >> // user has. QNX's QCC compiler is a modified GCC but it doesn't >> // support TR1 tuple. libc++ only provides std::tuple, in C++11 mode, >> // and it can be used with some compilers that define __GNUC__. >> -# if (defined(__GNUC__) && !defined(__CUDACC__) && (GTEST_GCC_VER_ >= >> 40000) \ >> - && !GTEST_OS_QNX && !defined(_LIBCPP_VERSION)) || _MSC_VER >= 1600 >> +# if (defined(__GNUC__) && !defined(__CUDACC__) && !GTEST_OS_QNX \ >> + && !defined(_LIBCPP_VERSION)) || _MSC_VER >= 1600 >> # define GTEST_ENV_HAS_TR1_TUPLE_ 1 >> # endif >> >> @@ -576,7 +576,7 @@ using ::std::tuple_size; >> # define BOOST_TR1_DETAIL_CONFIG_HPP_INCLUDED >> # include <tuple> >> >> -# elif defined(__GNUC__) && (GTEST_GCC_VER_ >= 40000) >> +# elif defined(__GNUC__) >> // GCC 4.0+ implements tr1/tuple in the <tr1/tuple> header. This does >> // not conform to the TR1 spec, which requires the header to be >> <tuple>. >> >> @@ -732,11 +732,11 @@ using ::std::tuple_size; >> // following the argument list: >> // >> // Sprocket* AllocateSprocket() GTEST_MUST_USE_RESULT_; >> -#if defined(__GNUC__) && (GTEST_GCC_VER_ >= 30400) && >> !defined(COMPILER_ICC) >> +#if defined(__GNUC__) && !defined(COMPILER_ICC) >> # define GTEST_MUST_USE_RESULT_ __attribute__ ((warn_unused_result)) >> #else >> # define GTEST_MUST_USE_RESULT_ >> -#endif // __GNUC__ && (GTEST_GCC_VER_ >= 30400) && !COMPILER_ICC >> +#endif // __GNUC__ && !COMPILER_ICC >> >> // Determine whether the compiler supports Microsoft's Structured >> Exception >> // Handling. This is supported by several Windows compilers but >> generally >> > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev > _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
