diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-08 21:32:44 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-08 21:32:44 +0200 |
| commit | 3339d3bce70afe9ae2ca10e9fcfc4b54b748fbf4 (patch) | |
| tree | 9cac355432ba25cc3d43017382d73e0640f50996 /src/lib/dcpomatic_time_coalesce.h | |
| parent | 00762c2d9a4240d016150cd7555aee3dad8542ae (diff) | |
Assorted C++11/formatting cleanups.
Diffstat (limited to 'src/lib/dcpomatic_time_coalesce.h')
| -rw-r--r-- | src/lib/dcpomatic_time_coalesce.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/lib/dcpomatic_time_coalesce.h b/src/lib/dcpomatic_time_coalesce.h index 56f82bcb6..015326bdd 100644 --- a/src/lib/dcpomatic_time_coalesce.h +++ b/src/lib/dcpomatic_time_coalesce.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2017 Carl Hetherington <cth@carlh.net> + Copyright (C) 2017-2021 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -18,17 +18,20 @@ */ + #include "dcpomatic_time.h" #include <iostream> + namespace dcpomatic { + /** @param periods Set of periods in ascending order of from time */ template <class T> -std::list<TimePeriod<T> > coalesce (std::list<TimePeriod<T> > periods) +std::list<TimePeriod<T>> coalesce (std::list<TimePeriod<T>> periods) { bool did_something; - std::list<TimePeriod<T> > coalesced; + std::list<TimePeriod<T>> coalesced; do { coalesced.clear (); did_something = false; @@ -49,4 +52,5 @@ std::list<TimePeriod<T> > coalesce (std::list<TimePeriod<T> > periods) return periods; } + } |