From 536010374e3a5b59928c1e2d9cbf6e857f3cc778 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Klinkovsk=C3=BD?= <klinkjak@fjfi.cvut.cz>
Date: Sat, 17 Nov 2018 10:57:42 +0100
Subject: [PATCH] Fixed ConfigDescription
---
src/TNL/Config/ConfigDescription.h | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/TNL/Config/ConfigDescription.h b/src/TNL/Config/ConfigDescription.h
index 2f05be6ddf..6aa1c52f8e 100644
--- a/src/TNL/Config/ConfigDescription.h
+++ b/src/TNL/Config/ConfigDescription.h
@@ -181,6 +181,10 @@ public:
*/
const ConfigEntryBase* getEntry( const String& name ) const
{
+ // ConfigDelimiter has empty name
+ if( ! name )
+ return nullptr;
+
const int entries_num = entries.size();
for( int i = 0; i < entries_num; i++ )
if( entries[ i ]->name == name )
@@ -196,6 +200,10 @@ public:
template< class T >
const T* getDefaultValue( const String& name ) const
{
+ // ConfigDelimiter has empty name
+ if( ! name )
+ return nullptr;
+
const int entries_num = entries.size();
for( int i = 0; i < entries_num; i++ )
if( entries[ i ]->name == name ) {
@@ -213,6 +221,10 @@ public:
template< class T >
T* getDefaultValue( const String& name )
{
+ // ConfigDelimiter has empty name
+ if( ! name )
+ return nullptr;
+
const int entries_num = entries.size();
for( int i = 0; i < entries_num; i++ )
if( entries[ i ] -> name == name ) {
@@ -223,7 +235,7 @@ public:
return nullptr;
}
std::cerr << "Asking for the default value of unknown parameter." << std::endl;
- return NULL;
+ return nullptr;
}
/**
--
GitLab