gcc compilation fix and introduce new splice method.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30959 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/support/RandomAccessList.h b/src/support/RandomAccessList.h
index 5014378c440101c1596ceade7a392c55474a017a..f4cf29ce5cea94e79c47ac27d84f2691b089ab60 100644 (file)
--- a/src/support/RandomAccessList.h
+++ b/src/support/RandomAccessList.h
@@ -13,6 +13,7 @@
 #ifndef RANDOM_ACESS_LIST_H
 #define RANDOM_ACESS_LIST_H
 
 #ifndef RANDOM_ACESS_LIST_H
 #define RANDOM_ACESS_LIST_H
 

+#include <algorithm>

 #include <vector>
 #include <list>
 
 #include <vector>
 #include <list>
 


@@ -248,13 +249,19 @@ public:
 
        void swap(size_t i, size_t j)
        {
 
        void swap(size_t i, size_t j)
        {

-               size_t const p = max(i, j);
-               size_t const q = min(i, j);
+               size_t const p = std::max(i, j);
+               size_t const q = std::min(i, j);

                container_.splice(iterCont_[p], container_, iterCont_[q]);
                container_.splice(iterCont_[q], container_, iterCont_[p]);
                recreateVector();
        }
 
                container_.splice(iterCont_[p], container_, iterCont_[q]);
                container_.splice(iterCont_[q], container_, iterCont_[p]);
                recreateVector();
        }
 

+       void splice(iterator where, iterator first, iterator last)
+       {
+               container_.splice(where, container_, first, last);
+               recreateVector();
+       }
+

        void swap(RandomAccessList & x)
        {
                std::swap(container_, x.container_);
        void swap(RandomAccessList & x)
        {
                std::swap(container_, x.container_);