remove CXX_WORKING_NAMESPACES

[lyx.git] / src / bufferlist.h

diff --git a/src/bufferlist.h b/src/bufferlist.h
index 57c59faffb786d84838355dcb36197f17194a2b0..efd76c486d23582fe72f881d808ca1caf713f2fd 100644 (file)
--- a/src/bufferlist.h
+++ b/src/bufferlist.h
@@ -20,7 +20,7 @@
 
 #include "buffer.h"
 #include "debug.h"
-#include "support/utility.hpp"
+#include <boost/utility.hpp>
 
 /** A class to hold all the buffers in a structure
   The point of this class is to hide from bufferlist what kind
@@ -30,7 +30,7 @@
   This class should ideally be enclosed inside class BufferList, but that
   gave me an "internal gcc error".
   */
-class BufferStorage : public noncopyable {
+class BufferStorage : public boost::noncopyable {
 public:
        ///
        typedef std::vector<Buffer *> Container;
@@ -39,6 +39,8 @@ public:
        ///
        typedef Container::const_iterator const_iterator;
        ///
+       typedef Container::size_type size_type;
+       ///
        bool empty() const { return container.empty(); }
        ///
        void release(Buffer * buf);
@@ -57,7 +59,7 @@ public:
        ///
        Buffer * operator[](int c) { return container[c]; }
        ///
-       int size() const { return container.size(); }
+       size_type size() const { return container.size(); }
 private:
        ///
        Container container;
@@ -66,7 +68,7 @@ private:
 
 /** The class govern all open buffers.
  */
-class BufferList : public noncopyable {
+class BufferList : public boost::noncopyable {
 public:
        ///
        BufferList();
@@ -118,7 +120,7 @@ public:
 
        ///
        void emergencyWriteAll();
-
+       
        /** Close buffer.
            @param buf the buffer that should be closed
            @return #false# if operation was canceled
@@ -137,7 +139,7 @@ public:
        /// returns a pointer to the buffer with the given name.
        Buffer * getBuffer(string const &);
        /// returns a pointer to the buffer with the given number.
-       Buffer * getBuffer(int);
+       Buffer * getBuffer(unsigned int);
 
 private:
        ///
@@ -145,6 +147,8 @@ private:
        
        ///
        list_state state_;
+       ///
+       void emergencyWrite(Buffer * buf);
 };
 
 #endif