code clean-up

Author: MaartenHilferink

rtc/dll/src/set/DataCompare.h

@@ -1,31 +1,12 @@
-//<HEADER> 
-/*
-Data & Model Server (DMS) is a server written in C++ for DSS applications. 
-Version: see srv/dms/rtc/dll/src/RtcVersion.h for version info.
+// Copyright (C) 1998-2024 Object Vision b.v. 
+// License: GNU GPL 3
+/////////////////////////////////////////////////////////////////////////////
 
-Copyright (C) 1998-2004  YUSE GSO Object Vision BV. 
+#if defined(_MSC_VER)
+#pragma once
+#endif
 
-Documentation on using the Data & Model Server software can be found at:
-http://www.ObjectVision.nl/DMS/
 
-See additional guidelines and notes in srv/dms/Readme-srv.txt 
-
-This library is free software; you can use, redistribute, and/or
-modify it under the terms of the GNU General Public License version 2 
-(the License) as published by the Free Software Foundation,
-provided that this entire header notice and readme-srv.txt is preserved.
-
-See LICENSE.TXT for terms of distribution or look at our web site:
-http://www.objectvision.nl/DMS/License.txt
-or alternatively at: http://www.gnu.org/copyleft/gpl.html
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details. However, specific warranties might be
-granted by an additional written contract for support, assistance and/or development
-*/
-//</HEADER>
 #if !defined(__RTC_SET_DATACOMPARE_H)
 #define __RTC_SET_DATACOMPARE_H
 

rtc/dll/src/set/IndexCompare.h

@@ -1,31 +1,10 @@
-//<HEADER> 
-/*
-Data & Model Server (DMS) is a server written in C++ for DSS applications. 
-Version: see srv/dms/rtc/dll/src/RtcVersion.h for version info.
+// Copyright (C) 1998-2024 Object Vision b.v. 
+// License: GNU GPL 3
+/////////////////////////////////////////////////////////////////////////////
 
-Copyright (C) 1998-2004  YUSE GSO Object Vision BV. 
-
-Documentation on using the Data & Model Server software can be found at:
-http://www.ObjectVision.nl/DMS/
-
-See additional guidelines and notes in srv/dms/Readme-srv.txt 
-
-This library is free software; you can use, redistribute, and/or
-modify it under the terms of the GNU General Public License version 2 
-(the License) as published by the Free Software Foundation,
-provided that this entire header notice and readme-srv.txt is preserved.
-
-See LICENSE.TXT for terms of distribution or look at our web site:
-http://www.objectvision.nl/DMS/License.txt
-or alternatively at: http://www.gnu.org/copyleft/gpl.html
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details. However, specific warranties might be
-granted by an additional written contract for support, assistance and/or development
-*/
-//</HEADER>
+#if defined(_MSC_VER)
+#pragma once
+#endif
 
 #if !defined(__RTC_SET_INDEXCOMPARE_H)
 #define __RTC_SET_INDEXCOMPARE_H
@@ -39,14 +18,22 @@ granted by an additional written contract for support, assistance and/or develop
 template <typename CI, typename E = SizeT>
 struct IndexCompareOper 
 {
-	IndexCompareOper(CI dataBegin): m_DataBegin(dataBegin) {}
-	bool operator ()(E left, E right)
+	using index_type = E;
+	using value_array_begin_type = CI;
+	using value_type = typename std::iterator_traits<value_array_begin_type>::value_type;
+
+	IndexCompareOper(value_array_begin_type dataBegin)
+		: m_DataBegin(dataBegin) 
+	{}
+
+	bool operator ()(index_type left, index_type right) const
 	{ 
 		return m_DataComp(m_DataBegin[left], m_DataBegin[right]);
 	}
-	typedef typename std::iterator_traits<CI>::value_type value_type;
-	CI m_DataBegin;
-	DataCompare<value_type> m_DataComp;
+
+	value_array_begin_type  m_DataBegin;
+
+	DataCompare<value_type> m_DataComp = {};
 };