Revert "Objective-C compililation support with cmake and C++11"

[lyx.git] / src / WordList.cpp

diff --git a/src/WordList.cpp b/src/WordList.cpp
index 96b7c35ea798c91a7a2726a0d28c1f61a82b694e..3a095afca230c3dba23bd0a93b9a3f14316f4671 100644 (file)
--- a/src/WordList.cpp
+++ b/src/WordList.cpp
@@ -12,14 +12,11 @@
 
 #include "WordList.h"
 
-#include "Language.h"
-
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/docstring.h"
-#include "support/weighted_btree.h"
-
 #include "support/lassert.h"
+#include "support/weighted_btree.h"
 
 #include <map>
 
@@ -28,12 +25,13 @@ using namespace std;
 namespace lyx {
 
 ///
-map<Language, WordList *> theGlobalWordList;
+typedef map<string, WordList *> GlobalWordList;
+GlobalWordList theGlobalWordList;
 
 
-WordList * theWordList(Language const & lang)
+WordList * theWordList(string const & lang)
 {
-       map<Language, WordList *>::iterator it = theGlobalWordList.find(lang);
+       GlobalWordList::iterator it = theGlobalWordList.find(lang);
        if (it != theGlobalWordList.end())
                return it->second;
        else
@@ -44,7 +42,7 @@ WordList * theWordList(Language const & lang)
 
 void WordList::cleanupWordLists()
 {
-       map<Language, WordList *>::const_iterator it = theGlobalWordList.begin();
+       GlobalWordList::const_iterator it = theGlobalWordList.begin();
        for (; it != theGlobalWordList.end(); ++it)
                delete it->second;
        theGlobalWordList.clear();
@@ -84,7 +82,7 @@ WordList::~WordList()
 docstring const & WordList::word(size_t idx) const
 {
        Impl::Words::const_iterator it = d->words_.find_summed_weight(idx);
-       LASSERT(it != d->words_.end(), /**/);
+       LASSERT(it != d->words_.end(), { static docstring dummy; return dummy; });
        
        // We use the key() method here, and not something like it->first
        // because the btree only returns (iterator-) temporary value pairs.