diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-07-10 02:02:19 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-07-10 02:02:19 +0200 |
| commit | 5b0e331380c83ec9835e8aa42fd342b2f0ad275d (patch) | |
| tree | 13c27f0b3420f5c3a268a5a22a9172675fdc370c /src/lib/environment_info.cc | |
| parent | 5d838bc863a7569e68546026c109607fd5a94362 (diff) | |
Use dcp::compose rather than our own.compose
Diffstat (limited to 'src/lib/environment_info.cc')
| -rw-r--r-- | src/lib/environment_info.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/environment_info.cc b/src/lib/environment_info.cc index 2a6d47a00..d7ac75ccb 100644 --- a/src/lib/environment_info.cc +++ b/src/lib/environment_info.cc @@ -19,11 +19,11 @@ */ -#include "compose.hpp" #include "cross.h" #include "log.h" #include "version.h" #include "warnings.h" +#include <dcp/compose.h> #include <dcp/version.h> #include <libssh/libssh.h> DCPOMATIC_DISABLE_WARNINGS @@ -85,12 +85,12 @@ environment_info () { list<string> info; - info.push_back (String::compose ("DCP-o-matic %1 git %2 using %3", dcpomatic_version, dcpomatic_git_commit, dependency_version_summary())); + info.push_back (dcp::compose ("DCP-o-matic %1 git %2 using %3", dcpomatic_version, dcpomatic_git_commit, dependency_version_summary())); { char buffer[128]; gethostname (buffer, sizeof (buffer)); - info.push_back (String::compose ("Host name %1", &buffer[0])); + info.push_back (dcp::compose ("Host name %1", &buffer[0])); } #ifdef DCPOMATIC_DEBUG @@ -109,7 +109,7 @@ environment_info () os_info.dwOSVersionInfoSize = sizeof (os_info); GetVersionEx (&os_info); info.push_back ( - String::compose ( + dcp::compose ( "Windows version %1.%2.%3", (int) os_info.dwMajorVersion, (int) os_info.dwMinorVersion, (int) os_info.dwBuildNumber ) @@ -141,9 +141,9 @@ environment_info () #endif #endif - info.push_back (String::compose ("CPU: %1, %2 processors", cpu_info(), boost::thread::hardware_concurrency())); + info.push_back (dcp::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)); + info.push_back (dcp::compose("Mount: %1 %2", i.first, i.second)); } return info; |