aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/include/debug/vector16
-rw-r--r--libstdc++-v3/testsuite/25_algorithms/heap/1.cc2
2 files changed, 12 insertions, 6 deletions
diff --git a/libstdc++-v3/include/debug/vector b/libstdc++-v3/include/debug/vector
index 12bd52f..f0c63a6 100644
--- a/libstdc++-v3/include/debug/vector
+++ b/libstdc++-v3/include/debug/vector
@@ -300,9 +300,11 @@ namespace __debug
}
#ifdef __GXX_EXPERIMENTAL_CXX0X__
- void
- push_back(_Tp&& __x)
- { emplace_back(std::move(__x)); }
+ template<typename _Up = _Tp>
+ typename __gnu_cxx::__enable_if<!std::__are_same<_Up, bool>::__value,
+ void>::__type
+ push_back(_Tp&& __x)
+ { emplace_back(std::move(__x)); }
template<typename... _Args>
void
@@ -360,9 +362,11 @@ namespace __debug
}
#ifdef __GXX_EXPERIMENTAL_CXX0X__
- iterator
- insert(iterator __position, _Tp&& __x)
- { return emplace(__position, std::move(__x)); }
+ template<typename _Up = _Tp>
+ typename __gnu_cxx::__enable_if<!std::__are_same<_Up, bool>::__value,
+ iterator>::__type
+ insert(iterator __position, _Tp&& __x)
+ { return emplace(__position, std::move(__x)); }
#endif
void
diff --git a/libstdc++-v3/testsuite/25_algorithms/heap/1.cc b/libstdc++-v3/testsuite/25_algorithms/heap/1.cc
index 571a293..4032ca8 100644
--- a/libstdc++-v3/testsuite/25_algorithms/heap/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/heap/1.cc
@@ -89,8 +89,10 @@ test02()
Gt gt;
+#ifndef _GLIBCXX_DEBUG
//const int logN = static_cast<int>(std::log(static_cast<double>(N)) + 0.5);
const int logN = 3;
+#endif
int s1[N];
std::copy(A, A + N, s1);