summaryrefslogtreecommitdiff
path: root/libstdc++-v3/include/bits/stl_pair.h
diff options
context:
space:
mode:
authorpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2011-08-11 17:53:05 +0000
committerpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2011-08-11 17:53:05 +0000
commitd07bb4f7da28395ae675adbd7ed48ca495f120b5 (patch)
treee77313f8a40001d91fa6a88c26442d6e8a13a5ac /libstdc++-v3/include/bits/stl_pair.h
parente4ae859de0fa4e0da931697be6853a178eb75c8e (diff)
downloadgcc-d07bb4f7da28395ae675adbd7ed48ca495f120b5.tar.gz
2011-08-11 Paolo Carlini <paolo.carlini@oracle.com>
* include/std/future: constexpr functions are implicitly inline. * include/std/chrono: Likewise. * include/std/complex: Likewise. * include/bits/move.h: Likewise. * include/bits/stl_pair.h: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@177679 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/bits/stl_pair.h')
-rw-r--r--libstdc++-v3/include/bits/stl_pair.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/include/bits/stl_pair.h b/libstdc++-v3/include/bits/stl_pair.h
index 967c86d718a..c4f33d0dcf6 100644
--- a/libstdc++-v3/include/bits/stl_pair.h
+++ b/libstdc++-v3/include/bits/stl_pair.h
@@ -275,8 +275,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifdef __GXX_EXPERIMENTAL_CXX0X__
// NB: DR 706.
template<class _T1, class _T2>
- inline constexpr pair<typename __decay_and_strip<_T1>::__type,
- typename __decay_and_strip<_T2>::__type>
+ constexpr pair<typename __decay_and_strip<_T1>::__type,
+ typename __decay_and_strip<_T2>::__type>
make_pair(_T1&& __x, _T2&& __y)
{
typedef typename __decay_and_strip<_T1>::__type __ds_type1;