X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fdcpomatic_time_coalesce.h;h=e103e80e67750947a35dfdc403af5183959f875f;hb=HEAD;hp=56f82bcb680932b1bb8ff86a263dddf594093892;hpb=a632e34e3c9ca94574fcab1b3006227ed2833766;p=dcpomatic.git 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 + Copyright (C) 2017-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,17 +18,20 @@ */ + #include "dcpomatic_time.h" #include + namespace dcpomatic { + /** @param periods Set of periods in ascending order of from time */ template -std::list > coalesce (std::list > periods) +std::list> coalesce (std::list> periods) { bool did_something; - std::list > coalesced; + std::list> coalesced; do { coalesced.clear (); did_something = false; @@ -49,4 +52,5 @@ std::list > coalesce (std::list > periods) return periods; } + }