diff options
| author | Kenneth Heafield <github@kheafield.com> | 2012-10-22 12:07:20 +0100 |
|---|---|---|
| committer | Kenneth Heafield <github@kheafield.com> | 2012-10-22 12:07:20 +0100 |
| commit | ac586bc9b156b4ae687cd5961ba1fe7b20ec57d6 (patch) | |
| tree | 052473b46d7fa18d51f897cdb9e7c93a7186dafd /utils/stringlib.h | |
| parent | 97b85c082b3e55c28a8b0c0eb762483ac84a1577 (diff) | |
| parent | ad6d4a1b2519896f2b16a282699ce4e64041fab8 (diff) | |
Merge remote branch 'upstream/master'
Conflicts:
Jamroot
bjam
decoder/Jamfile
decoder/cdec.cc
dpmert/Jamfile
jam-files/sanity.jam
klm/lm/Jamfile
klm/util/Jamfile
mira/Jamfile
Diffstat (limited to 'utils/stringlib.h')
| -rw-r--r-- | utils/stringlib.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/stringlib.h b/utils/stringlib.h index 75772c4d..ff5dc89d 100644 --- a/utils/stringlib.h +++ b/utils/stringlib.h @@ -86,7 +86,7 @@ bool match_begin(Str const& str,Prefix const& prefix) // source will be returned as a string, target must be a sentence or // a lattice (in PLF format) and will be returned as a Lattice object void ParseTranslatorInput(const std::string& line, std::string* input, std::string* ref); -struct Lattice; +class Lattice; void ParseTranslatorInputLattice(const std::string& line, std::string* input, Lattice* ref); inline std::string Trim(const std::string& str, const std::string& dropChars = " \t") { |