diff options
author | Kenneth Heafield <github@kheafield.com> | 2012-10-22 12:07:20 +0100 |
---|---|---|
committer | Kenneth Heafield <github@kheafield.com> | 2012-10-22 12:07:20 +0100 |
commit | 5f98fe5c4f2a2090eeb9d30c030305a70a8347d1 (patch) | |
tree | 9b6002f850e6dea1e3400c6b19bb31a9cdf3067f /gi/pyp-topics/src/contexts_lexer.h | |
parent | cf9994131993b40be62e90e213b1e11e6b550143 (diff) | |
parent | 21825a09d97c2e0afd20512f306fb25fed55e529 (diff) |
Merge remote branch 'upstream/master'
Conflicts:
Jamroot
bjam
decoder/Jamfile
decoder/cdec.cc
dpmert/Jamfile
jam-files/sanity.jam
klm/lm/Jamfile
klm/util/Jamfile
mira/Jamfile
Diffstat (limited to 'gi/pyp-topics/src/contexts_lexer.h')
-rw-r--r-- | gi/pyp-topics/src/contexts_lexer.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/gi/pyp-topics/src/contexts_lexer.h b/gi/pyp-topics/src/contexts_lexer.h deleted file mode 100644 index 66004990..00000000 --- a/gi/pyp-topics/src/contexts_lexer.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef _CONTEXTS_LEXER_H_ -#define _CONTEXTS_LEXER_H_ - -#include <iostream> -#include <vector> -#include <string> - -#include "dict.h" - -struct ContextsLexer { - typedef std::vector<std::string> Context; - struct PhraseContextsType { - std::string phrase; - std::vector<Context> contexts; - std::vector< std::pair<int,int> > counts; - }; - - typedef void (*ContextsCallback)(const PhraseContextsType& new_contexts, void* extra); - static void ReadContexts(std::istream* in, ContextsCallback func, void* extra); -}; - -#endif |