Module Name: src
Committed By: joerg
Date: Thu Nov 8 18:13:53 UTC 2012
Modified Files:
src/external/gpl3/gcc/dist/libstdc++-v3/include/bits: stl_queue.h
Log Message:
Merge r163231 from upstream to fix xulrunner build with Clang.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_queue.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_queue.h
diff -u src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_queue.h:1.1.1.1 src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_queue.h:1.2
--- src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_queue.h:1.1.1.1 Tue Jun 21 01:24:41 2011
+++ src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_queue.h Thu Nov 8 18:13:53 2012
@@ -1,6 +1,6 @@
// Queue implementation -*- C++ -*-
-// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@@ -137,16 +137,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
explicit
queue(_Sequence&& __c = _Sequence())
: c(std::move(__c)) { }
-
- queue(queue&& __q)
- : c(std::move(__q.c)) { }
-
- queue&
- operator=(queue&& __q)
- {
- c = std::move(__q.c);
- return *this;
- }
#endif
/**
@@ -451,17 +441,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
c.insert(c.end(), __first, __last);
std::make_heap(c.begin(), c.end(), comp);
}
-
- priority_queue(priority_queue&& __pq)
- : c(std::move(__pq.c)), comp(std::move(__pq.comp)) { }
-
- priority_queue&
- operator=(priority_queue&& __pq)
- {
- c = std::move(__pq.c);
- comp = std::move(__pq.comp);
- return *this;
- }
#endif
/**
