summaryrefslogtreecommitdiff
path: root/src/asset.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-12-28 01:15:24 +0000
committerCarl Hetherington <cth@carlh.net>2014-12-28 01:15:24 +0000
commitea81a192a65a03b664dac61de21e06cea7aa97a2 (patch)
treef21447aeb9f24320ea6c1c4cb7a05539646bb85a /src/asset.cc
parent75788462338b1b4f464d075465da3cb372c40004 (diff)
Purge assert() from src/, at least (not asdcplib).
Diffstat (limited to 'src/asset.cc')
-rw-r--r--src/asset.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/asset.cc b/src/asset.cc
index 2ca58a62..e2dcc0f6 100644
--- a/src/asset.cc
+++ b/src/asset.cc
@@ -25,6 +25,7 @@
#include "asset.h"
#include "util.h"
#include "exceptions.h"
+#include "dcp_assert.h"
#include "compose.hpp"
#include <libxml++/libxml++.h>
@@ -51,7 +52,7 @@ Asset::Asset (boost::filesystem::path file)
void
Asset::write_to_pkl (xmlpp::Node* node, Standard standard) const
{
- assert (!_file.empty ());
+ DCP_ASSERT (!_file.empty ());
xmlpp::Node* asset = node->add_child ("Asset");
asset->add_child("Id")->add_child_text ("urn:uuid:" + _id);
@@ -64,7 +65,7 @@ Asset::write_to_pkl (xmlpp::Node* node, Standard standard) const
void
Asset::write_to_assetmap (xmlpp::Node* node, boost::filesystem::path root) const
{
- assert (!_file.empty ());
+ DCP_ASSERT (!_file.empty ());
xmlpp::Node* asset = node->add_child ("Asset");
asset->add_child("Id")->add_child_text ("urn:uuid:" + _id);
@@ -83,7 +84,7 @@ Asset::write_to_assetmap (xmlpp::Node* node, boost::filesystem::path root) const
string
Asset::hash (function<void (float)> progress) const
{
- assert (!_file.empty ());
+ DCP_ASSERT (!_file.empty ());
if (_hash.empty ()) {
_hash = make_digest (_file, progress);