Merge pull request #102 from AgoinsUSGS/m05325 (3acb43b3) · Commits · aflab / astrogeology / ISIS3

isis/src/base/objs/iTime/iTime.cpp

+1 −17

Original line number	Diff line number	Diff line
		@@ -62,8 +62,6 @@ namespace Isis {

		p_et = et;
		NaifStatus::CheckErrors();

		UnloadLeapSecondKernel();
		}


		@@ -87,8 +85,6 @@ namespace Isis {

		p_et = et;
		NaifStatus::CheckErrors();

		UnloadLeapSecondKernel();
		}

		// Overload of "=" with a c string
		@@ -102,8 +98,6 @@ namespace Isis {

		p_et = et;
		NaifStatus::CheckErrors();

		UnloadLeapSecondKernel();
		}


		@@ -111,7 +105,6 @@ namespace Isis {
		void iTime::operator=(const double time) {
		LoadLeapSecondKernel();
		p_et = time;
		UnloadLeapSecondKernel();
		}

		/**
		@@ -484,15 +477,6 @@ namespace Isis {
		p_lpInitialized = true;
		}

		//! Uses the Naif routines to unload the leap second kernel.
		void iTime::UnloadLeapSecondKernel() {
		// Inorder to improve the speed of iTime comparisons, the leapsecond
		// kernel is loaded only once and left open.

		//string leapSecondName(p_leapSecond.expanded());
		//unload_c (leapSecondName.c_str());
		}

		/**
		* Returns the current Greenwich Mean iTime
		* The time is based on the system time, so it is only as

+3 −3

Original line number	Diff line number	Diff line
		@@ -70,6 +70,8 @@ namespace Isis {
		* setEt and addition operators
		* @history 2015-07-21 Kristin Berry - Added NaifStatus::CheckErrors() to see if any NAIF errors
		* were signaled. References #2248.
		* @history 2018-03-15 Adam Goins - Removed deprecated function iTime::UnloadLeapSecondKernel().
		* Fixes #5325.
		*/
		class iTime {
		public:
		@@ -148,11 +150,9 @@ namespace Isis {
		passed into the constructor or the operator= member*/

		void LoadLeapSecondKernel();
		void UnloadLeapSecondKernel();

		static bool p_lpInitialized;
		};
		};

		#endif