Use git diff instead of diff-index for setlocalversion.

[loba.git] / named_object_list.h

diff --git a/named_object_list.h b/named_object_list.h
index 2c691faba198aec9b64e308e5535c3dbeff16628..7731a89f5d99e08d179b78e33c2f59f3f11d26f6 100644 (file)
--- a/named_object_list.h
+++ b/named_object_list.h
@@ -65,7 +65,7 @@ public:
         if (it != assoc.end())
             return (*it->second)();
         else
         if (it != assoc.end())
             return (*it->second)();
         else

-            return NULL;
+            return nullptr;

     }
 
     const std::string& get_name(iterator& it) const { return it->first; }
     }
 
     const std::string& get_name(iterator& it) const { return it->first; }


@@ -130,7 +130,7 @@ public:
         if (it != assoc.end())
             return (*it->second)(arg1, arg2);
         else
         if (it != assoc.end())
             return (*it->second)(arg1, arg2);
         else

-            return NULL;
+            return nullptr;

     }
 
     const std::string& get_name(iterator& it) const { return it->first; }
     }
 
     const std::string& get_name(iterator& it) const { return it->first; }