X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fclass_info.h;h=9d4a118f9a3236d9933cfef5d9add4c846d6a73e;hb=aed514f534cc6b4438822c1fcf80c203a828a94c;hp=8e86d63286e018139fe204139152ed53a22884c5;hpb=da64e515abf7243bc4c84ca3631470931c4e6691;p=ginac.git

diff --git a/ginac/class_info.h b/ginac/class_info.h
index 8e86d632..9d4a118f 100644
--- a/ginac/class_info.h
+++ b/ginac/class_info.h
@@ -3,7 +3,7 @@
  *  Helper templates to provide per-class information for class hierarchies. */
 
 /*
- *  GiNaC Copyright (C) 1999-2005 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2022 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -20,16 +20,17 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GINAC_CLASS_INFO_H__
-#define __GINAC_CLASS_INFO_H__
+#ifndef GINAC_CLASS_INFO_H
+#define GINAC_CLASS_INFO_H
 
 #include <cstddef> // for size_t
-#include <vector>
-#include <map>
-#include <string>
-#include <iostream>
+#include <cstring>
 #include <iomanip>
+#include <iostream>
+#include <map>
 #include <stdexcept>
+#include <string>
+#include <vector>
 
 namespace GiNaC {
 
@@ -39,13 +40,13 @@ namespace GiNaC {
 template <class OPT>
 class class_info {
 public:
-	class_info(const OPT & o) : options(o), next(first), parent(NULL)
+	class_info(const OPT & o) : options(o), next(first), parent(nullptr)
 	{
 		first = this;
 		parents_identified = false;
 	}
 
-	/** Get pointer to class_info of parent class (or NULL). */
+	/** Get pointer to class_info of parent class (or nullptr). */
 	class_info *get_parent() const
 	{
 		identify_parents();
@@ -154,7 +155,7 @@ void class_info<OPT>::dump_hierarchy(bool verbose)
 		tree.push_back(tree_node(p));
 
 	// Identify children for all nodes and find the root
-	tree_node *root = NULL;
+	tree_node *root = nullptr;
 	for (typename std::vector<tree_node>::iterator i = tree.begin(); i != tree.end(); ++i) {
 		class_info *p = i->info->get_parent();
 		if (p) {
@@ -179,7 +180,7 @@ void class_info<OPT>::identify_parents()
 		for (class_info *p = first; p; p = p->next) {
 			const char *parent_name = p->options.get_parent_name();
 			for (class_info *q = first; q; q = q->next) {
-				if (strcmp(q->options.get_name(), parent_name) == 0) {
+				if (std::strcmp(q->options.get_name(), parent_name) == 0) {
 					p->parent = q;
 					break;
 				}
@@ -189,9 +190,9 @@ void class_info<OPT>::identify_parents()
 	}
 }
 
-template <class OPT> class_info<OPT> *class_info<OPT>::first = NULL;
+template <class OPT> class_info<OPT> *class_info<OPT>::first = nullptr;
 template <class OPT> bool class_info<OPT>::parents_identified = false;
 
 } // namespace GiNaC
 
-#endif // ndef __GINAC_CLASS_INFO_H__
+#endif // ndef GINAC_CLASS_INFO_H