diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-11-05 22:25:29 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-11-05 22:25:29 +0000 |
| commit | 7deddfded2d013c07a639873a4c90bfed40fd03e (patch) | |
| tree | 3df2a52207fec5bec55c28303aa57a8bd9b4e620 /libstdc++-v3/include/bits/stl_pair.h | |
| parent | c79b54af83c8031caac515081fb7c56a127b90e3 (diff) | |
| download | gcc-7deddfded2d013c07a639873a4c90bfed40fd03e.tar.gz | |
2010-11-05 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 166377
2010-11-05 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 166377
* gcc/Makefile.in (MELT_RAW_CFLAGS): removed LIBELFINC
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@166380 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/bits/stl_pair.h')
| -rw-r--r-- | libstdc++-v3/include/bits/stl_pair.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libstdc++-v3/include/bits/stl_pair.h b/libstdc++-v3/include/bits/stl_pair.h index f4b339db91a..0e651e7ba76 100644 --- a/libstdc++-v3/include/bits/stl_pair.h +++ b/libstdc++-v3/include/bits/stl_pair.h @@ -66,10 +66,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) #ifdef __GXX_EXPERIMENTAL_CXX0X__ + /// piecewise_construct_t struct piecewise_construct_t { }; - static const piecewise_construct_t piecewise_construct - = piecewise_construct_t(); + /// piecewise_construct + constexpr piecewise_construct_t piecewise_construct = piecewise_construct_t(); // forward declarations template<typename...> @@ -93,7 +94,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // 265. std::pair::pair() effects overly restrictive /** The default constructor creates @c first and @c second using their * respective default constructors. */ - pair() + _GLIBCXX_CONSTEXPR pair() : first(), second() { } /** Two objects may be passed to a @c pair constructor to be copied. */ |