From: xushiweizh_at_[hidden]
Date: 2008-06-30 22:55:40
Author: xushiwei
Date: 2008-06-30 22:55:39 EDT (Mon, 30 Jun 2008)
New Revision: 46935
URL: http://svn.boost.org/trac/boost/changeset/46935
Log:
priority_queue -> ext_priority_queue
Binary files modified:
sandbox/memory/libs/memory/bin/linux/32/libboost-memory.so
Text files modified:
sandbox/memory/boost/memory/gc_alloc.hpp | 4 ++--
sandbox/memory/boost/memory/stl/queue.hpp | 16 ++++++++--------
sandbox/memory/libs/memory/memory.prj.li32 | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
Modified: sandbox/memory/boost/memory/gc_alloc.hpp
==============================================================================
--- sandbox/memory/boost/memory/gc_alloc.hpp (original)
+++ sandbox/memory/boost/memory/gc_alloc.hpp 2008-06-30 22:55:39 EDT (Mon, 30 Jun 2008)
@@ -21,7 +21,7 @@
#endif
#ifndef BOOST_MEMORY_STL_QUEUE_HPP
-#include "stl/queue.hpp" // NS_BOOST_MEMORY::priority_queue
+#include "stl/queue.hpp" // NS_BOOST_MEMORY::ext_priority_queue
#endif
#if !defined(_VECTOR_) && !defined(_VECTOR)
@@ -167,7 +167,7 @@
}
};
typedef std::vector<FreeMemHeader*> Container;
- typedef NS_BOOST_MEMORY::priority_queue<FreeMemHeader*, Container, Pred> PriorityQ;
+ typedef NS_BOOST_MEMORY::ext_priority_queue<FreeMemHeader*, Container, Pred> PriorityQ;
char* m_begin;
char* m_end;
Modified: sandbox/memory/boost/memory/stl/queue.hpp
==============================================================================
--- sandbox/memory/boost/memory/stl/queue.hpp (original)
+++ sandbox/memory/boost/memory/stl/queue.hpp 2008-06-30 22:55:39 EDT (Mon, 30 Jun 2008)
@@ -37,7 +37,7 @@
template <class Type,
class Sequence = std::vector<Type>,
class Pred = std::less<Type> >
-class priority_queue
+class ext_priority_queue
{
public:
typedef typename Sequence::value_type value_type;
@@ -52,24 +52,24 @@
Pred m_pred;
public:
- priority_queue() {}
- explicit priority_queue(const Pred& x) : m_coll(), m_pred(x) {}
- priority_queue(const Pred& x, const Sequence& s)
+ ext_priority_queue() {}
+ explicit ext_priority_queue(const Pred& x) : m_coll(), m_pred(x) {}
+ ext_priority_queue(const Pred& x, const Sequence& s)
: m_coll(s), m_pred(x)
{ std::make_heap(m_coll.begin(), m_coll.end(), m_pred); }
template <class InputIterator>
- priority_queue(InputIterator first, InputIterator last)
+ ext_priority_queue(InputIterator first, InputIterator last)
: m_coll(first, last) { std::make_heap(m_coll.begin(), m_coll.end(), m_pred); }
template <class InputIterator>
- priority_queue(InputIterator first,
+ ext_priority_queue(InputIterator first,
InputIterator last, const Pred& x)
: m_coll(first, last), m_pred(x)
{ std::make_heap(m_coll.begin(), m_coll.end(), m_pred); }
template <class InputIterator>
- priority_queue(InputIterator first, InputIterator last,
+ ext_priority_queue(InputIterator first, InputIterator last,
const Pred& x, const Sequence& s)
: m_coll(s), m_pred(x)
{
@@ -91,7 +91,7 @@
void clear() {
m_coll.clear();
}
- void swap(priority_queue& o) {
+ void swap(ext_priority_queue& o) {
m_coll.swap(o.m_coll);
std::swap(m_pred, o.m_pred);
}
Modified: sandbox/memory/libs/memory/bin/linux/32/libboost-memory.so
==============================================================================
Binary files. No diff available.
Modified: sandbox/memory/libs/memory/memory.prj.li32
==============================================================================
--- sandbox/memory/libs/memory/memory.prj.li32 (original)
+++ sandbox/memory/libs/memory/memory.prj.li32 2008-06-30 22:55:39 EDT (Mon, 30 Jun 2008)
@@ -22,7 +22,7 @@
Options Debug; MultiThread; AnsiChar; NoRtti; Exception; WarningAll
ObjDir LDebug
LibDir
-Libraries pthread
+Libraries pthread
[Source]
src/*.cpp