diff options
| author | Wu, Ke <wuke@cs.umd.edu> | 2014-12-17 16:11:38 -0500 |
|---|---|---|
| committer | Wu, Ke <wuke@cs.umd.edu> | 2014-12-17 16:11:38 -0500 |
| commit | 1613f1fc44ca67820afd7e7b21eb54b316c8ce55 (patch) | |
| tree | e02b77084f28a18df6b854f87a986124db44d717 /klm/lm/builder/joint_order.hh | |
| parent | bd9308e22b5434aa220cc57d82ee867464a011f1 (diff) | |
| parent | 796768086a687d3f1856fef6489c34fe4d373642 (diff) | |
Merge with upstream
Diffstat (limited to 'klm/lm/builder/joint_order.hh')
| -rw-r--r-- | klm/lm/builder/joint_order.hh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/klm/lm/builder/joint_order.hh b/klm/lm/builder/joint_order.hh index b5620144..7235d4f7 100644 --- a/klm/lm/builder/joint_order.hh +++ b/klm/lm/builder/joint_order.hh @@ -1,14 +1,14 @@ -#ifndef LM_BUILDER_JOINT_ORDER__ -#define LM_BUILDER_JOINT_ORDER__ +#ifndef LM_BUILDER_JOINT_ORDER_H +#define LM_BUILDER_JOINT_ORDER_H -#include "lm/builder/multi_stream.hh" +#include "lm/builder/ngram_stream.hh" #include "lm/lm_exception.hh" #include <string.h> namespace lm { namespace builder { -template <class Callback, class Compare> void JointOrder(const ChainPositions &positions, Callback &callback) { +template <class Callback, class Compare> void JointOrder(const util::stream::ChainPositions &positions, Callback &callback) { // Allow matching to reference streams[-1]. NGramStreams streams_with_dummy; streams_with_dummy.InitWithDummy(positions); @@ -40,4 +40,4 @@ template <class Callback, class Compare> void JointOrder(const ChainPositions &p }} // namespaces -#endif // LM_BUILDER_JOINT_ORDER__ +#endif // LM_BUILDER_JOINT_ORDER_H |