diff options
| author | Ulrich Germann <ugermann@inf.ed.ac.uk> | 2013-09-25 16:52:05 +0400 |
|---|---|---|
| committer | Ulrich Germann <ugermann@inf.ed.ac.uk> | 2013-09-25 16:52:05 +0400 |
| commit | 82274ffda7e96b519afdfc6207d6bb43815d8a4c (patch) | |
| tree | defc69bb5f553938b62f980bbaf944256aa62983 /moses/Parameter.h | |
| parent | 96df1f265937c77f32d5eeb5bcac1fbb586ed6ad (diff) | |
| parent | bfcefec239681c777aa1aa8a2c0ea0b691d611d3 (diff) | |
Merge branch 'dynamic-phrase-tables'
Conflicts:
moses/FF/ControlRecombination.cpp
moses/Phrase.cpp
Diffstat (limited to 'moses/Parameter.h')
| -rw-r--r-- | moses/Parameter.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/moses/Parameter.h b/moses/Parameter.h index 479a1c67b..f5016fb2b 100644 --- a/moses/Parameter.h +++ b/moses/Parameter.h @@ -31,8 +31,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA namespace Moses { -typedef std::vector<std::string> PARAM_VEC; -typedef std::map<std::string, PARAM_VEC > PARAM_MAP; +typedef std::vector<std::string> PARAM_VEC; +typedef std::map<std::string, PARAM_VEC > PARAM_MAP; typedef std::map<std::string, bool> PARAM_BOOL; typedef std::map<std::string, std::string > PARAM_STRING; |