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 74e1317074f2df2a5cf603b081fd28d50beceb5a..161322d866314fd322d9d0434560a786532f05d9 100644 (file)
--- a/src/LaTeX.h
+++ b/src/LaTeX.h
@@ -74,17 +74,30 @@ public:
        std::set<string> databases;
        ///
        std::set<string> styles;
-       ///
-       operator==(Aux_Info const & o) const {
-               return aux_file == o.aux_file &&
-                       citations == o.citations &&
-                       databases == o.databases &&
-                       styles == o.styles;
-       }
 };
 
+
+///
+inline
+bool operator==(Aux_Info const & a, Aux_Info const & o)
+{
+       return a.aux_file == o.aux_file &&
+               a.citations == o.citations &&
+               a.databases == o.databases &&
+               a.styles == o.styles;
+}
+
+
+///
+inline
+bool operator!=(Aux_Info const & a, Aux_Info const & o)
+{
+       return !(a == o);
+}
+
+
 ///
-class LaTeX : public noncopyable {
+class LaTeX : public boost::noncopyable {
 public:
        /** Return values from scanLogFile() and run() (to come)
            
@@ -170,10 +183,11 @@ protected:
        void scanAuxFile(string const &, Aux_Info &);
        
        ///
-       void updateBibtexDependencies(DepTable &, vector<Aux_Info> const &);
+       void updateBibtexDependencies(DepTable &,
+                                     std::vector<Aux_Info> const &);
 
        ///
-       bool runBibTeX(vector<Aux_Info> const &);
+       bool runBibTeX(std::vector<Aux_Info> const &);
 
        ///
        void deleteFilesOnError() const;