Applied Angus patch to compile on DEC C++ and to avoid name clashes

[lyx.git] / src / layout.h

diff --git a/src/layout.h b/src/layout.h
index 2eb47cef59451c2a9d71c161199504fc47df2180..9cfe9098e6a95e16898c013bff17e4050a4619b1 100644 (file)
--- a/src/layout.h
+++ b/src/layout.h
@@ -21,7 +21,7 @@
 #include "lyxlex.h"
 #include "lyxfont.h"
 #include "Spacing.h"
-#include "support/utility.hpp"
+#include <boost/utility.hpp>
 
 /// Reads the style files
 extern void LyXSetStyle();
@@ -210,7 +210,7 @@ public:
        ///
        string const & name() const { return name_; }
        ///
-       void name(string const & n) { name_ = n; }
+       void setName(string const & n) { name_ = n; }
        ///
        string const & obsoleted_by() const { return obsoleted_by_; }
        ///
@@ -547,7 +547,7 @@ std::ostream & operator<<(std::ostream & os, LyXTextClass::PageSides p);
 
 
 ///
-class LyXTextClassList : public noncopyable {
+class LyXTextClassList : public boost::noncopyable {
 public:
        ///
        typedef std::vector<LyXTextClass> ClassList;
@@ -565,7 +565,7 @@ public:
                                LyXTextClass::size_type layout) const;
 
        /// Gets layout number from textclass number and layout name
-       std::pair<bool, LyXTextClass::size_type>
+       std::pair<bool, LyXTextClass::size_type> const
        NumberOfLayout(size_type textclass,
                       string const & name) const;
 
@@ -577,7 +577,7 @@ public:
        /** Gets textclass number from name.
            Returns -1 if textclass name does not exist
        */
-       std::pair<bool, size_type>
+       std::pair<bool, size_type> const
        NumberOfClass(string const & textclass) const;
 
        ///