diff options
| author | Wu, Ke <wuke@cs.umd.edu> | 2014-12-17 16:15:13 -0500 |
|---|---|---|
| committer | Wu, Ke <wuke@cs.umd.edu> | 2014-12-17 16:15:13 -0500 |
| commit | 17dbb7d5ab1544899b1b9e867d2246a0a93e3aa8 (patch) | |
| tree | 7fa2a51763a1b67fb325e86b0e3f764dd119cd70 /klm/util/joint_sort.hh | |
| parent | 1983c75c35b7f5dc3f356a2f9a9345d632b87650 (diff) | |
| parent | 1613f1fc44ca67820afd7e7b21eb54b316c8ce55 (diff) | |
Merge branch 'const_reorder_2' into softsyn_2
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 |