diff options
| author | Patrick Simianer <p@simianer.de> | 2011-10-19 20:56:22 +0200 |
|---|---|---|
| committer | Patrick Simianer <p@simianer.de> | 2011-10-19 20:56:22 +0200 |
| commit | 967e1c98980b07909b03ff5e3e71442cbeb216e8 (patch) | |
| tree | 37149761e897ba48a3c40456347ff1df3bd24d79 /utils | |
| parent | 9beaeb42b71fa504bfa41a402cb17eb6ac4001af (diff) | |
merged, compiles but not working
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/fdict.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/utils/fdict.h b/utils/fdict.h index 9c8d7cde..f0871b9a 100644 --- a/utils/fdict.h +++ b/utils/fdict.h @@ -33,7 +33,6 @@ struct FD { hash_ = new PerfectHashFunction(cmph_file); #endif } ->>>>>>> upstream/master static inline int NumFeats() { #ifdef HAVE_CMPH if (hash_) return hash_->number_of_keys(); |