X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flocal_time.h;h=d213b898f5371e9589254c8c0fe3db6e21d3e69a;hb=f30ff718cbe924c8fcb6bf3a6a485271da85855d;hp=9407aeed5962a586d2b64857e5f80495963c6a7f;hpb=5591a50b918d2dc784a9e15688dfe24eb2b6dfcc;p=libdcp.git diff --git a/src/local_time.h b/src/local_time.h index 9407aeed..d213b898 100644 --- a/src/local_time.h +++ b/src/local_time.h @@ -15,6 +15,20 @@ You should have received a copy of the GNU General Public License along with libdcp. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations + including the two. + + You must obey the GNU General Public License in all respects + for all of the code used other than OpenSSL. If you modify + file(s) with this exception, you may extend this exception to your + version of the file(s), but you are not obligated to do so. If you + do not wish to do so, delete this exception statement from your + version. If you delete this exception statement from all source + files in the program, then also delete it here. */ /** @file src/local_time.h @@ -50,7 +64,7 @@ public: std::string as_string (bool with_millisecond = false) const; std::string date () const; - std::string time_of_day (bool with_millisecond = false) const; + std::string time_of_day (bool with_second, bool with_millisecond) const; bool operator== (LocalTime const & other) const; bool operator!= (LocalTime const & other) const;