[Phylobase-commits] r802 - in pkg/src: . ncl

[noreply at r-forge.r-project.org]

Author: mtholder
Date: 2010-07-23 20:04:37 +0200 (Fri, 23 Jul 2010)
New Revision: 802

Modified:
   pkg/src/ncl/nxsstring.h
   pkg/src/nxsstring.cpp
Log:
bug fixes revealed by g++ on MinGW

Modified: pkg/src/ncl/nxsstring.h
===================================================================
--- pkg/src/ncl/nxsstring.h	2010-07-15 09:11:59 UTC (rev 801)
+++ pkg/src/ncl/nxsstring.h	2010-07-23 18:04:37 UTC (rev 802)
@@ -130,7 +130,7 @@
 		NxsString			&operator<<(char c);
 		NxsString			&operator<<(const std::string &s);
 		NxsString			&operator<<(const IndexSet &s);
-		NxsString			&operator<<(NxsString &(*funcPtr)(NxsString	&));
+		//NxsString			&operator<<(NxsString &(*funcPtr)(NxsString	&));
 
 		// Functions that should be in base class string but aren't
 		void				clear();
@@ -536,7 +536,7 @@
 		}
 	return false;
 	}
-
+#if 0
 /*!
 	Allows functions that take and return references to NxsString strings to be placed in a series of << operators.
 	See the NxsString endl function.
@@ -546,7 +546,7 @@
 	{
 	return funcPtr(*this);
 	}
-
+#endif
 /*!
 	Returns true if `c' is any Nexus punctuation character:
 >

Modified: pkg/src/nxsstring.cpp
===================================================================
--- pkg/src/nxsstring.cpp	2010-07-15 09:11:59 UTC (rev 801)
+++ pkg/src/nxsstring.cpp	2010-07-23 18:04:37 UTC (rev 802)
@@ -831,7 +831,7 @@
 	if ((l == 0 && (endP - b) == 0))
 		throw NxsX_NotANumber();
 #else
-	if ((l == 0 && ((long) endP - (long) b) == 0))
+	if (l == 0 && endP == b)
 		throw NxsX_NotANumber();
 #endif
 	return l;
@@ -856,7 +856,7 @@
 		if ((d == 0.0 && (endP - b) == 0))
 			throw NxsX_NotANumber();
 #else
-		if ((d == 0.0 && ((long) endP - (long) b) == 0))
+		if (d == 0.0 &&  endP == b)
 			throw NxsX_NotANumber();
 #endif
 		if (d == HUGE_VAL)