Some compilers don't like x = {} where x is a boost::optional<string>

[libdcp.git] / src / object.cc

diff --git a/src/object.cc b/src/object.cc
index 315e501aaf4403f37f5de4a68439d2b783a9489a..c3bccd06013de32c4e360aa64467e148d792718a 100644 (file)
--- a/src/object.cc
+++ b/src/object.cc
@@ -1,44 +1,60 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    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/object.cc
- *  @brief Object class.
+ *  @brief Object class
  */
 
+
 #include "object.h"
+#include "dcp_assert.h"
 #include "util.h"
 
+
 using std::string;
 using namespace dcp;
 
-/** Create an Object with a random ID. */
+
 Object::Object ()
-       : _id (make_uuid ())
+       : _id (make_uuid())
 {
 
 }
 
-/** Create an Object with a given ID.
- *  @param id ID to use.
- */
+
 Object::Object (string id)
        : _id (id)
 {
-
+       DCP_ASSERT (_id.substr(0, 9) != "urn:uuid:");
 }