diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-12-18 14:51:49 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-12-18 14:51:49 +0000 |
| commit | 95dc81ecbc031b6ffaee2053884115de4ee4b393 (patch) | |
| tree | b6f7fd430fe5de560bc6505eafc9c4e3729e7bed /src/stl_binary_tables.cc | |
| parent | c41e0eb748cd39ce6ebe0c7c354e99ccf87a951b (diff) | |
| parent | 485794f8322b090a22da841961025b19642e42a2 (diff) | |
Merge branch '1.0' of git.carlh.net:git/libsub into 1.0
Diffstat (limited to 'src/stl_binary_tables.cc')
| -rw-r--r-- | src/stl_binary_tables.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/stl_binary_tables.cc b/src/stl_binary_tables.cc index 9aaf4b8..db623bf 100644 --- a/src/stl_binary_tables.cc +++ b/src/stl_binary_tables.cc @@ -19,8 +19,8 @@ #include "stl_binary_tables.h" #include "exceptions.h" +#include "sub_assert.h" #include "compose.hpp" -#include <cassert> using std::map; using std::string; @@ -55,7 +55,7 @@ enum_to_file (E k, map<F, STLBinaryCode<E> > m) } } - assert (false); + SUB_ASSERT (false); return F (); } @@ -84,7 +84,7 @@ description_to_enum (string d, map<F, STLBinaryCode<E> > const & m) return boost::optional<E> (); } - + DisplayStandard STLBinaryTables::display_standard_file_to_enum (string s) const { @@ -150,13 +150,13 @@ STLBinaryTables::comment_enum_to_file (Comment v) const { return enum_to_file (v, _comment_map); } - + string STLBinaryTables::display_standard_enum_to_description (DisplayStandard v) const { return enum_to_description (v, _display_standard_map); } - + string STLBinaryTables::language_group_enum_to_description (LanguageGroup v) const { @@ -205,13 +205,13 @@ STLBinaryTables::STLBinaryTables () code<DisplayStandard, string> (_display_standard_map, "0", DISPLAY_STANDARD_OPEN_SUBTITLING, "Open subtitling"); code<DisplayStandard, string> (_display_standard_map, "1", DISPLAY_STANDARD_LEVEL_1_TELETEXT, "Level 1 teletext"); code<DisplayStandard, string> (_display_standard_map, "2", DISPLAY_STANDARD_LEVEL_2_TELETEXT, "Level 2 teletext"); - + code<LanguageGroup, string> (_language_group_map, "00", LANGUAGE_GROUP_LATIN, "Latin"); code<LanguageGroup, string> (_language_group_map, "01", LANGUAGE_GROUP_LATIN_CYRILLIC, "Latin/Cyrillic"); code<LanguageGroup, string> (_language_group_map, "02", LANGUAGE_GROUP_LATIN_ARABIC, "Latin/Arabic"); code<LanguageGroup, string> (_language_group_map, "03", LANGUAGE_GROUP_LATIN_GREEK, "Latin/Greek"); code<LanguageGroup, string> (_language_group_map, "04", LANGUAGE_GROUP_LATIN_HEBREW, "Latin/Hebrew"); - + code<Language, string> (_language_map, "00", LANGUAGE_UNKNOWN, "Unknown"); code<Language, string> (_language_map, "01", LANGUAGE_ALBANIAN, "Albanian"); code<Language, string> (_language_map, "02", LANGUAGE_BRETON, "Breton"); |