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 | b26cda84e05d4523eee069234a975a0153bf8608 (patch) | |
| tree | 61c9da4f8dd6070f27c8e81812a76fc0a8cf2d8d /klm/util/joint_sort.hh | |
| parent | cd7bc67f475fdfd07fba003ac4cca40e83944740 (diff) | |
| parent | b1ed81ef3216b212295afa76c5d20a56fb647204 (diff) | |
Merge branch 'master' of github.com:redpony/cdec
Diffstat (limited to 'klm/util/joint_sort.hh')
| -rw-r--r-- | klm/util/joint_sort.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/klm/util/joint_sort.hh b/klm/util/joint_sort.hh index b1ec48e2..de4b554f 100644 --- a/klm/util/joint_sort.hh +++ b/klm/util/joint_sort.hh @@ -1,5 +1,5 @@ -#ifndef UTIL_JOINT_SORT__ -#define UTIL_JOINT_SORT__ +#ifndef UTIL_JOINT_SORT_H +#define UTIL_JOINT_SORT_H /* A terrifying amount of C++ to coax std::sort into soring one range while * also permuting another range the same way. @@ -143,4 +143,4 @@ template <class KeyIter, class ValueIter> void JointSort(const KeyIter &key_begi } // namespace util -#endif // UTIL_JOINT_SORT__ +#endif // UTIL_JOINT_SORT_H |