diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-14 01:00:05 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-14 01:00:05 +0200 |
| commit | 274dd30f2b11fe8ea563a2ac7436c9d463865b0b (patch) | |
| tree | 199e7447606339d461f6f87d16095376d8f809b3 /src/subtitle_asset_internal.h | |
| parent | 4bd57fbbac67ac04ec47a9765b9f278aa1691851 (diff) | |
Fix/hide some warnings.
Diffstat (limited to 'src/subtitle_asset_internal.h')
| -rw-r--r-- | src/subtitle_asset_internal.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/subtitle_asset_internal.h b/src/subtitle_asset_internal.h index c7037dcf..9b5bb2da 100644 --- a/src/subtitle_asset_internal.h +++ b/src/subtitle_asset_internal.h @@ -42,10 +42,13 @@ #include "array_data.h" +#include "dcp_time.h" #include "raw_convert.h" #include "types.h" -#include "dcp_time.h" +#include "warnings.h" +LIBDCP_DISABLE_WARNINGS #include <libxml++/libxml++.h> +LIBDCP_ENABLE_WARNINGS struct take_intersection_test; @@ -131,7 +134,7 @@ public: , text (text_) {} - virtual xmlpp::Element* as_xml (xmlpp::Element* parent, Context &) const; + virtual xmlpp::Element* as_xml (xmlpp::Element* parent, Context &) const override; std::string text; }; @@ -149,7 +152,7 @@ public: , _direction (direction) {} - xmlpp::Element* as_xml (xmlpp::Element* parent, Context& context) const; + xmlpp::Element* as_xml (xmlpp::Element* parent, Context& context) const override; private: HAlign _h_align; @@ -171,7 +174,7 @@ public: , _fade_down (fade_down) {} - xmlpp::Element* as_xml (xmlpp::Element* parent, Context& context) const; + xmlpp::Element* as_xml (xmlpp::Element* parent, Context& context) const override; private: Time _in; @@ -194,7 +197,7 @@ public: , _v_position (v_position) {} - xmlpp::Element* as_xml (xmlpp::Element* parent, Context& context) const; + xmlpp::Element* as_xml (xmlpp::Element* parent, Context& context) const override; private: ArrayData _png_data; |