* lyxfunctional.h: delete compare_memfun and helper classes

[lyx.git] / src / support / translator.h

diff --git a/src/support/translator.h b/src/support/translator.h
index fb42297b38311dc3761d25f80d6fb2abd55e8684..4d4020dafa8c4a1977d1ec9ee6d275fcfafda374 100644 (file)
--- a/src/support/translator.h
+++ b/src/support/translator.h
@@ -12,12 +12,13 @@
 #ifndef TRANSLATOR_H
 #define TRANSLATOR_H
 
+#include <boost/assert.hpp>
+
 #include <vector>
 #include <utility>
 #include <algorithm>
 #include <functional>
 
-#include "support/LAssert.h"
 #include "support/lyxfunctional.h"
 /**
  * This class template is used to translate between two elements, specifically
@@ -47,10 +48,16 @@ public:
        void addPair(T1 const & first, T2 const & second) {
                map.push_back(MapPair(first, second));
        }
+       // Add the contents of \c other
+       void add(Translator const & other) {
+               if (other.map.empty())
+                       return;
+               map.insert(map.end(), other.map.begin(), other.map.end());
+       }
 
        /// Find the mapping for the first argument
        T2 const & find(T1 const & first) const {
-               lyx::support::Assert(!map.empty());
+               BOOST_ASSERT(!map.empty());
 
                // For explanation see the next find() function.
                typename Map::const_iterator it =
@@ -67,7 +74,7 @@ public:
 
        /// Find the mapping for the second argument
        T1 const & find(T2 const & second) const {
-               lyx::support::Assert(!map.empty());
+               BOOST_ASSERT(!map.empty());
 
                // The idea is as follows:
                // find_if() will try to compare the data in the vector with