projects
/
platform
/
upstream
/
gcc48.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 4.8.1
[platform/upstream/gcc48.git]
/
libstdc++-v3
/
include
/
ext
/
array_allocator.h
diff --git
a/libstdc++-v3/include/ext/array_allocator.h
b/libstdc++-v3/include/ext/array_allocator.h
index
2c9666a
..
95a6a38
100644
(file)
--- a/
libstdc++-v3/include/ext/array_allocator.h
+++ b/
libstdc++-v3/include/ext/array_allocator.h
@@
-1,7
+1,6
@@
// array allocator -*- C++ -*-
// array allocator -*- C++ -*-
-// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-// Free Software Foundation, Inc.
+// Copyright (C) 2004-2013 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@
-35,6
+34,9
@@
#include <bits/functexcept.h>
#include <tr1/array>
#include <bits/move.h>
#include <bits/functexcept.h>
#include <tr1/array>
#include <bits/move.h>
+#if __cplusplus >= 201103L
+#include <type_traits>
+#endif
namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
{
namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
{
@@
-74,7
+76,7
@@
_GLIBCXX_BEGIN_NAMESPACE_VERSION
max_size() const _GLIBCXX_USE_NOEXCEPT
{ return size_t(-1) / sizeof(_Tp); }
max_size() const _GLIBCXX_USE_NOEXCEPT
{ return size_t(-1) / sizeof(_Tp); }
-#if
def __GXX_EXPERIMENTAL_CXX0X__
+#if
__cplusplus >= 201103L
template<typename _Up, typename... _Args>
void
construct(_Up* __p, _Args&&... __args)
template<typename _Up, typename... _Args>
void
construct(_Up* __p, _Args&&... __args)
@@
-113,6
+115,12
@@
_GLIBCXX_BEGIN_NAMESPACE_VERSION
typedef _Tp value_type;
typedef _Array array_type;
typedef _Tp value_type;
typedef _Array array_type;
+#if __cplusplus >= 201103L
+ // _GLIBCXX_RESOLVE_LIB_DEFECTS
+ // 2103. std::allocator propagate_on_container_move_assignment
+ typedef std::true_type propagate_on_container_move_assignment;
+#endif
+
private:
array_type* _M_array;
size_type _M_used;
private:
array_type* _M_array;
size_type _M_used;