#1260 Replaced assert() with CAF_ASSERT() in AppFwk

This commit is contained in:
Magne Sjaastad committed 2017-03-08 08:19:51 +01:00
1 parent a16a0a3bb5
commit 6791600d03
63 files changed
+198 -220

No files matched your search

@@ -1,14 +1,13 @@
#pragma once
#include "cafAssert.h"
#include "cafInternalPdmValueFieldSpecializations.h"
#include "cafPdmFieldHandle.h"
#include "cafPdmPointer.h"
#include "cafPdmValueField.h"
#include "cafInternalPdmValueFieldSpecializations.h"
#include <QVariant>
#include <assert.h>
namespace caf
{
@@ -32,8 +31,8 @@ public:
// Basic access
void setValue(const DataType& fieldValue) { assert(isInitializedByInitFieldMacro()); if (m_valueSetter) m_valueSetter->setValue(fieldValue); }
DataType value() const { assert(m_valueGetter); return m_valueGetter->getValue(); }
void setValue(const DataType& fieldValue) { CAF_ASSERT(isInitializedByInitFieldMacro()); if (m_valueSetter) m_valueSetter->setValue(fieldValue); }
DataType value() const { CAF_ASSERT(m_valueGetter); return m_valueGetter->getValue(); }
// Implementation of PdmValueField interface