std::shared_ptr

[dcpomatic.git] / src / lib / subtitle_analysis.cc

diff --git a/src/lib/subtitle_analysis.cc b/src/lib/subtitle_analysis.cc
index f8254f00d62fa791742d097812445801e727a7d6..49041151f6260ab44a2ad02d7ee2ae162587ddd4 100644 (file)
--- a/src/lib/subtitle_analysis.cc
+++ b/src/lib/subtitle_analysis.cc
@@ -20,13 +20,16 @@
 
 #include "subtitle_analysis.h"
 #include "exceptions.h"
+#include "warnings.h"
 #include <libcxml/cxml.h>
 #include <dcp/raw_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 using std::string;
 using dcp::raw_convert;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 int const SubtitleAnalysis::_current_state_version = 1;
 
@@ -39,7 +42,7 @@ SubtitleAnalysis::SubtitleAnalysis (boost::filesystem::path path)
 
        if (f.optional_number_child<int>("Version").get_value_or(1) < _current_state_version) {
                /* Too old.  Throw an exception so that this analysis is re-run. */
-               throw OldFormatError ("Audio analysis file is too old");
+               throw OldFormatError ("Subtitle analysis file is too old");
        }
 
        cxml::NodePtr bounding_box = f.optional_node_child("BoundingBox");