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

[lyx.git] / src / LaTeX.h

diff --git a/src/LaTeX.h b/src/LaTeX.h
index dfa5937ddb5ccfb6a79c776b7951b4014ead5be4..161322d866314fd322d9d0434560a786532f05d9 100644 (file)
--- a/src/LaTeX.h
+++ b/src/LaTeX.h
@@ -74,9 +74,6 @@ public:
        std::set<string> databases;
        ///
        std::set<string> styles;
-       ///
-       friend
-       bool operator==(Aux_Info const & a, Aux_Info const & o);
 };
 
 
@@ -92,7 +89,15 @@ bool operator==(Aux_Info const & a, Aux_Info const & o)
 
 
 ///
-class LaTeX : public noncopyable {
+inline
+bool operator!=(Aux_Info const & a, Aux_Info const & o)
+{
+       return !(a == o);
+}
+
+
+///
+class LaTeX : public boost::noncopyable {
 public:
        /** Return values from scanLogFile() and run() (to come)
            
@@ -182,7 +187,7 @@ protected:
                                      std::vector<Aux_Info> const &);
 
        ///
-       bool runBibTeX(vector<Aux_Info> const &);
+       bool runBibTeX(std::vector<Aux_Info> const &);
 
        ///
        void deleteFilesOnError() const;