Commit af936b95 authored Jan 06, 2020 by Jesse Mapel Committed by Kristin Jan 06, 2020

Moved Kernel type compositon to source file (#3633)

parent 50ca52e1

isis/src/system/objs/Kernel/Kernel.cpp

+13 −0

Original line number	Diff line number	Diff line
		@@ -181,4 +181,17 @@ namespace Isis {
		bool Kernel::operator<(const Kernel &other) const {
		return (this->m_kernelType < other.m_kernelType);
		}


		/**
		* Logical operator for combining Type flags.
		*
		* @param a The first Type flag.
		* @param b The second Type flag.
		*
		* @return Type flag that contains all Types in a and all Types in b.
		*/
		Kernel::Type operator\|(Kernel::Type a, Kernel::Type b) {
		return static_cast<Kernel::Type>(static_cast<int>(a) \| static_cast<int>(b));
		}
		} //end namespace isis

isis/src/system/objs/Kernel/Kernel.h

+2 −11

Original line number	Diff line number	Diff line
		@@ -88,16 +88,7 @@ namespace Isis {
		Type m_kernelType; //!< Enumeration value indicating the kernel type
		};

		/**
		* Logical operator for combining Type flags.
		*
		* @param a The first Type flag.
		* @param b The second Type flag.
		*
		* @return Type flag that contains all Types in a and all Types in b.
		*/
		Kernel::Type operator\|(Kernel::Type a, Kernel::Type b) {
		return static_cast<Kernel::Type>(static_cast<int>(a) \| static_cast<int>(b));
		}

		Kernel::Type operator\|(Kernel::Type a, Kernel::Type b);
		};
		#endif