X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fenvironment_info.cc;h=31279acfbf539b1be227542d9194af3ebd4a0ab2;hp=5b1f56f727e279122211616742cb4598ad0cce32;hb=HEAD;hpb=2ead4f7cdb8c8232613e6d7041133907b9ae2048

diff --git a/src/lib/environment_info.cc b/src/lib/environment_info.cc
index 5b1f56f72..2e0347c79 100644
--- a/src/lib/environment_info.cc
+++ b/src/lib/environment_info.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,12 +18,15 @@
 
 */
 
-#include "log.h"
+
 #include "compose.hpp"
-#include "version.h"
 #include "cross.h"
+#include "log.h"
+#include "version.h"
 #include <dcp/version.h>
+#include <dcp/warnings.h>
 #include <libssh/libssh.h>
+LIBDCP_DISABLE_WARNINGS
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
@@ -31,14 +34,17 @@ extern "C" {
 #include <libswscale/swscale.h>
 #include <libavutil/pixfmt.h>
 }
+LIBDCP_ENABLE_WARNINGS
 #include <boost/thread.hpp>
 
 #include "i18n.h"
 
-using std::string;
+
 using std::list;
 using std::pair;
 using std::shared_ptr;
+using std::string;
+
 
 /** @param v Version as used by FFmpeg.
  *  @return A string representation of v.
@@ -52,6 +58,7 @@ ffmpeg_version_to_string (int v)
 	return buffer;
 }
 
+
 /** Return a user-readable string summarising the versions of our dependencies */
 static
 string
@@ -72,6 +79,7 @@ dependency_version_summary ()
 	return buffer;
 }
 
+
 list<string>
 environment_info ()
 {
@@ -133,10 +141,9 @@ environment_info ()
 #endif
 #endif
 
-	info.push_back (String::compose ("CPU: %1, %2 processors", cpu_info(), boost::thread::hardware_concurrency ()));
-	list<pair<string, string> > const m = mount_info ();
-	for (list<pair<string, string> >::const_iterator i = m.begin(); i != m.end(); ++i) {
-		info.push_back (String::compose ("Mount: %1 %2", i->first, i->second));
+	info.push_back (String::compose ("CPU: %1, %2 processors", cpu_info(), boost::thread::hardware_concurrency()));
+	for (auto const& i: mount_info()) {
+		info.push_back (String::compose("Mount: %1 %2", i.first, i.second));
 	}
 
 	return info;