Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
googletest
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
googletest
Commits
e68adf5c
Commit
e68adf5c
authored
Jun 09, 2009
by
zhanyong.wan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enables tr1 tuple on Symbian.
parent
81950158
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
2 deletions
+20
-2
gtest-port.h
include/gtest/internal/gtest-port.h
+20
-2
No files found.
include/gtest/internal/gtest-port.h
View file @
e68adf5c
...
@@ -359,7 +359,24 @@
...
@@ -359,7 +359,24 @@
// gtest-port.h's responsibility to #include the header implementing
// gtest-port.h's responsibility to #include the header implementing
// tr1/tuple.
// tr1/tuple.
#if GTEST_HAS_TR1_TUPLE
#if GTEST_HAS_TR1_TUPLE
#if defined(__GNUC__) && (GTEST_GCC_VER_ >= 40000)
#if GTEST_OS_SYMBIAN
// On Symbian, BOOST_HAS_TR1_TUPLE causes Boost's TR1 tuple library to
// use STLport's tuple implementation, which unfortunately doesn't
// work as the copy of STLport distributed with Symbian is incomplete.
// By making sure BOOST_HAS_TR1_TUPLE is undefined, we force Boost to
// use its own tuple implementation.
#ifdef BOOST_HAS_TR1_TUPLE
#undef BOOST_HAS_TR1_TUPLE
#endif // BOOST_HAS_TR1_TUPLE
// This prevents <boost/tr1/detail/config.hpp>, which defines
// BOOST_HAS_TR1_TUPLE, from being #included by Boost's <tuple>.
#define BOOST_TR1_DETAIL_CONFIG_HPP_INCLUDED
#include <tuple>
#elif defined(__GNUC__) && (GTEST_GCC_VER_ >= 40000)
// GCC 4.0+ implements tr1/tuple in the <tr1/tuple> header. This does
// 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>.
// not conform to the TR1 spec, which requires the header to be <tuple>.
#include <tr1/tuple>
#include <tr1/tuple>
...
@@ -367,7 +384,8 @@
...
@@ -367,7 +384,8 @@
// If the compiler is not GCC 4.0+, 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 // GTEST_OS_SYMBIAN
#endif // GTEST_HAS_TR1_TUPLE
#endif // GTEST_HAS_TR1_TUPLE
// Determines whether clone(2) is supported.
// Determines whether clone(2) is supported.
...
...
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