From a1fb2aee4594a9ffd653808182779ab8e71e331c Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Fri, 10 Jul 2015 15:47:49 +0200
Subject: [PATCH] [GL] Abort TemplateVec ctor if nullptr input.
This restores the previous behaviour.
---
GeoLib/TemplateVec.h | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/GeoLib/TemplateVec.h b/GeoLib/TemplateVec.h
index f44515f0642..f8315c94472 100644
--- a/GeoLib/TemplateVec.h
+++ b/GeoLib/TemplateVec.h
@@ -17,12 +17,12 @@
#define TEMPLATEVEC_H_
#include <algorithm>
+#include <cstdlib>
#include <map>
#include <vector>
#include <string>
-// ThirdParty/logog
-#include "logog/include/logog.hpp"
+#include <logog/include/logog.hpp>
namespace GeoLib
{
@@ -58,8 +58,10 @@ public:
_name(name), _data_vec(data_vec), _name_id_map (elem_name_map)
{
if (_data_vec == nullptr)
+ {
ERR("Constructor TemplateVec: vector of data elements is a nullptr.");
- assert(_data_vec);
+ std::abort();
+ }
if (!_name_id_map)
_name_id_map = new NameIdMap;
--
GitLab