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 | ef2df950520a47ca7011736648334eedeae5297a (patch) | |
| tree | feb7893845075429573ca935e7f6b130132f2381 /utils/fdict.h | |
| parent | eb14e36d0b29f19321d44dd7dfa73cc703838d86 (diff) | |
merged, compiles but not working
Diffstat (limited to 'utils/fdict.h')
| -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(); |