diff options
| author | armatthews <armatthe@cmu.edu> | 2014-10-13 14:59:23 -0400 |
|---|---|---|
| committer | armatthews <armatthe@cmu.edu> | 2014-10-13 14:59:23 -0400 |
| commit | 9a06ff1465eb3477ac3d1e92ab52e7eae40316a8 (patch) | |
| tree | 808c266a3f510d00f37cd19c3f1da91d8fc683f7 /klm/lm/builder/joint_order.hh | |
| parent | e51da099233df0a384b04fe5908b30e44040d13e (diff) | |
| parent | d3e2ec203a5cf550320caa8023ac3dd103b0be7d (diff) | |
Merge branch 'master' of github.com:redpony/cdec
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 |