Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
125783fb
Commit
125783fb
authored
May 05, 2009
by
zhanyong.wan
Browse files
Fixes tr1 tuple's path when compiled with gcc version < 4.0.0 (by Zhanyong Wan).
parent
bf0d0a44
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
include/gmock/internal/gmock-port.h
include/gmock/internal/gmock-port.h
+6
-4
No files found.
include/gmock/internal/gmock-port.h
View file @
125783fb
...
@@ -48,12 +48,14 @@
...
@@ -48,12 +48,14 @@
// To avoid conditional compilation everywhere, we make it
// To avoid conditional compilation everywhere, we make it
// gmock-port.h's responsibility to #include the header implementing
// gmock-port.h's responsibility to #include the header implementing
// tr1/tuple.
// tr1/tuple.
#if defined(__GNUC__)
#if defined(__GNUC__) && GTEST_GCC_VER_ >= 40000
// GCC implements tr1/tuple in the <tr1/tuple> header. This does not
// GTEST_GCC_VER_ is defined in gtest-port.h and 40000 corresponds to
// conform to the TR1 spec, which requires the header to be <tuple>.
// version 4.0.0.
// 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>.
#include <tr1/tuple>
#include <tr1/tuple>
#else
#else
// If the compiler is not GCC, we assume the user is using a
// If the compiler is not GCC
4.0+
, we assume the user is using a
// spec-conforming TR1 implementation.
// spec-conforming TR1 implementation.
#include <tuple>
#include <tuple>
#endif // __GNUC__
#endif // __GNUC__
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment