Move EnumerateVocab to namespace lm

git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@4335 1f5c12ca-751b-0410-a591-d2e778427230

kenlm/lm/config.hh

@@ -8,10 +8,12 @@
 
 /* Configuration for ngram model.  Separate header to reduce pollution. */
 
-namespace lm { namespace ngram {
-
+namespace lm {
+  
 class EnumerateVocab;
 
+namespace ngram {
+
 struct Config {
   // EFFECTIVE FOR BOTH ARPA AND BINARY READS 
 

kenlm/lm/enumerate_vocab.hh

@@ -5,7 +5,6 @@
 #include "util/string_piece.hh"
 
 namespace lm {
-namespace ngram {
 
 /* If you need the actual strings in the vocabulary, inherit from this class
  * and implement Add.  Then put a pointer in Config.enumerate_vocab; it does
@@ -23,7 +22,6 @@ class EnumerateVocab {
     EnumerateVocab() {}
 };
 
-} // namespace ngram
 } // namespace lm
 
 #endif // LM_ENUMERATE_VOCAB__

kenlm/lm/vocab.hh

@@ -15,10 +15,10 @@
 
 namespace lm {
 class ProbBackoff;
+class EnumerateVocab;
 
 namespace ngram {
 class Config;
-class EnumerateVocab;
 
 namespace detail {
 uint64_t HashForVocab(const char *str, std::size_t len);

moses/src/LanguageModelKen.cpp

@@ -72,7 +72,7 @@ namespace
   };
 
 
-class MappingBuilder : public lm::ngram::EnumerateVocab
+class MappingBuilder : public lm::EnumerateVocab
 {
 public:
   MappingBuilder(FactorCollection &factorCollection, std::vector<lm::WordIndex> &mapping)