diff options
| author | Patrick Simianer <simianer@cl.uni-heidelberg.de> | 2013-02-18 18:31:23 +0100 |
|---|---|---|
| committer | Patrick Simianer <simianer@cl.uni-heidelberg.de> | 2013-02-18 18:31:23 +0100 |
| commit | 12f2eab0e7dc7167af47cddf8ef88968656277da (patch) | |
| tree | 28953cc5de058908056b319222afc60d1efb6660 /klm/lm/builder | |
| parent | f051e98fb35c4ce69e489ef6550840bd6cd617fd (diff) | |
| parent | 95c364f2cb002241c4a62bedb1c5ef6f1e9a7f22 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'klm/lm/builder')
| -rw-r--r-- | klm/lm/builder/Makefile.am | 2 | ||||
| -rw-r--r-- | klm/lm/builder/discount.hh | 2 | ||||
| -rw-r--r-- | klm/lm/builder/lmplz_main.cc (renamed from klm/lm/builder/main.cc) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/klm/lm/builder/Makefile.am b/klm/lm/builder/Makefile.am index b5c147fd..317e03ce 100644 --- a/klm/lm/builder/Makefile.am +++ b/klm/lm/builder/Makefile.am @@ -1,7 +1,7 @@ bin_PROGRAMS = builder builder_SOURCES = \ - main.cc \ + lmplz_main.cc \ adjust_counts.cc \ adjust_counts.hh \ corpus_count.cc \ diff --git a/klm/lm/builder/discount.hh b/klm/lm/builder/discount.hh index 754fb20d..4d0aa4fd 100644 --- a/klm/lm/builder/discount.hh +++ b/klm/lm/builder/discount.hh @@ -3,7 +3,7 @@ #include <algorithm> -#include <inttypes.h> +#include <stdint.h> namespace lm { namespace builder { diff --git a/klm/lm/builder/main.cc b/klm/lm/builder/lmplz_main.cc index 90b9dca2..90b9dca2 100644 --- a/klm/lm/builder/main.cc +++ b/klm/lm/builder/lmplz_main.cc |