[Phylobase-commits] r245 - branches/nclrepair/src/ncl/ncl
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Tue Aug 5 22:52:03 CEST 2008
Author: bcomeara
Date: 2008-08-05 22:52:03 +0200 (Tue, 05 Aug 2008)
New Revision: 245
Modified:
branches/nclrepair/src/ncl/ncl/nxsassumptionsblock.cpp
branches/nclrepair/src/ncl/ncl/nxscharactersblock.cpp
branches/nclrepair/src/ncl/ncl/nxscharactersblock.h
branches/nclrepair/src/ncl/ncl/nxsdistancesblock.cpp
branches/nclrepair/src/ncl/ncl/nxsreader.cpp
branches/nclrepair/src/ncl/ncl/nxssetreader.cpp
branches/nclrepair/src/ncl/ncl/nxsstring.cpp
branches/nclrepair/src/ncl/ncl/nxstaxablock.cpp
branches/nclrepair/src/ncl/ncl/nxstreesblock.cpp
branches/nclrepair/src/ncl/ncl/nxstreesblock.h
branches/nclrepair/src/ncl/ncl/nxsunalignedblock.cpp
Log:
updated ncl src files with Mark Holder's modifications for GCC 4.3.1
Modified: branches/nclrepair/src/ncl/ncl/nxsassumptionsblock.cpp
===================================================================
--- branches/nclrepair/src/ncl/ncl/nxsassumptionsblock.cpp 2008-08-05 20:50:11 UTC (rev 244)
+++ branches/nclrepair/src/ncl/ncl/nxsassumptionsblock.cpp 2008-08-05 20:52:03 UTC (rev 245)
@@ -16,9 +16,11 @@
// along with NCL; if not, write to the Free Software Foundation, Inc.,
// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
+#include <iomanip>
+#include <climits>
#include "ncl/nxsassumptionsblock.h"
-#include <iomanip>
+
#include "ncl/nxssetreader.h"
#include "ncl/nxsreader.h"
using namespace std;
Modified: branches/nclrepair/src/ncl/ncl/nxscharactersblock.cpp
===================================================================
--- branches/nclrepair/src/ncl/ncl/nxscharactersblock.cpp 2008-08-05 20:50:11 UTC (rev 244)
+++ branches/nclrepair/src/ncl/ncl/nxscharactersblock.cpp 2008-08-05 20:52:03 UTC (rev 245)
@@ -20,11 +20,11 @@
* This file includes contributions by Brian O'Meara. August 2005.
* These changes include the ability to parse continuous data types.
*/
+#include <iomanip>
+#include <climits>
#include "ncl/nxscharactersblock.h"
-#include <iomanip>
-
#include "ncl/nxsreader.h"
#include "ncl/nxsassumptionsblock.h"
#include "ncl/nxssetreader.h"
Modified: branches/nclrepair/src/ncl/ncl/nxscharactersblock.h
===================================================================
--- branches/nclrepair/src/ncl/ncl/nxscharactersblock.h 2008-08-05 20:50:11 UTC (rev 244)
+++ branches/nclrepair/src/ncl/ncl/nxscharactersblock.h 2008-08-05 20:52:03 UTC (rev 245)
@@ -22,6 +22,7 @@
#include <sstream>
#include <cfloat>
+#include <climits>
#include "ncl/nxsdiscretedatum.h"
#include "ncl/nxsdefs.h"
Modified: branches/nclrepair/src/ncl/ncl/nxsdistancesblock.cpp
===================================================================
--- branches/nclrepair/src/ncl/ncl/nxsdistancesblock.cpp 2008-08-05 20:50:11 UTC (rev 244)
+++ branches/nclrepair/src/ncl/ncl/nxsdistancesblock.cpp 2008-08-05 20:52:03 UTC (rev 245)
@@ -16,10 +16,11 @@
// along with NCL; if not, write to the Free Software Foundation, Inc.,
// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
+#include <iomanip>
+#include <climits>
#include "ncl/nxsdistancesblock.h"
-#include <iomanip>
#include "ncl/nxsreader.h"
using namespace std;
Modified: branches/nclrepair/src/ncl/ncl/nxsreader.cpp
===================================================================
--- branches/nclrepair/src/ncl/ncl/nxsreader.cpp 2008-08-05 20:50:11 UTC (rev 244)
+++ branches/nclrepair/src/ncl/ncl/nxsreader.cpp 2008-08-05 20:52:03 UTC (rev 245)
@@ -19,6 +19,7 @@
#include <algorithm>
#include <set>
#include <fstream>
+#include <climits>
#include "ncl/nxsreader.h"
#include "ncl/nxscharactersblock.h"
Modified: branches/nclrepair/src/ncl/ncl/nxssetreader.cpp
===================================================================
--- branches/nclrepair/src/ncl/ncl/nxssetreader.cpp 2008-08-05 20:50:11 UTC (rev 244)
+++ branches/nclrepair/src/ncl/ncl/nxssetreader.cpp 2008-08-05 20:52:03 UTC (rev 245)
@@ -16,7 +16,7 @@
// along with NCL; if not, write to the Free Software Foundation, Inc.,
// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-
+#include <climits>
#include "ncl/nxssetreader.h"
#include "ncl/nxstoken.h"
#include <algorithm>
Modified: branches/nclrepair/src/ncl/ncl/nxsstring.cpp
===================================================================
--- branches/nclrepair/src/ncl/ncl/nxsstring.cpp 2008-08-05 20:50:11 UTC (rev 244)
+++ branches/nclrepair/src/ncl/ncl/nxsstring.cpp 2008-08-05 20:52:03 UTC (rev 245)
@@ -16,6 +16,7 @@
// along with NCL; if not, write to the Free Software Foundation, Inc.,
// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
+#include <climits>
#include "ncl/ncl.h"
#include "ncl/nxsstring.h"
#include <cstdarg>
Modified: branches/nclrepair/src/ncl/ncl/nxstaxablock.cpp
===================================================================
--- branches/nclrepair/src/ncl/ncl/nxstaxablock.cpp 2008-08-05 20:50:11 UTC (rev 244)
+++ branches/nclrepair/src/ncl/ncl/nxstaxablock.cpp 2008-08-05 20:52:03 UTC (rev 245)
@@ -16,7 +16,7 @@
// along with NCL; if not, write to the Free Software Foundation, Inc.,
// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-
+#include <climits>
#include "ncl/nxstaxablock.h"
#include "ncl/nxsreader.h"
Modified: branches/nclrepair/src/ncl/ncl/nxstreesblock.cpp
===================================================================
--- branches/nclrepair/src/ncl/ncl/nxstreesblock.cpp 2008-08-05 20:50:11 UTC (rev 244)
+++ branches/nclrepair/src/ncl/ncl/nxstreesblock.cpp 2008-08-05 20:52:03 UTC (rev 245)
@@ -16,6 +16,7 @@
// along with NCL; if not, write to the Free Software Foundation, Inc.,
// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
+#include <climits>
#include "ncl/nxstreesblock.h"
#include <sstream>
Modified: branches/nclrepair/src/ncl/ncl/nxstreesblock.h
===================================================================
--- branches/nclrepair/src/ncl/ncl/nxstreesblock.h 2008-08-05 20:50:11 UTC (rev 244)
+++ branches/nclrepair/src/ncl/ncl/nxstreesblock.h 2008-08-05 20:52:03 UTC (rev 245)
@@ -19,7 +19,7 @@
#ifndef NCL_NXSTREESBLOCK_H
#define NCL_NXSTREESBLOCK_H
-
+#include <climits>
#include <cfloat>
#include "ncl/nxstaxablock.h"
Modified: branches/nclrepair/src/ncl/ncl/nxsunalignedblock.cpp
===================================================================
--- branches/nclrepair/src/ncl/ncl/nxsunalignedblock.cpp 2008-08-05 20:50:11 UTC (rev 244)
+++ branches/nclrepair/src/ncl/ncl/nxsunalignedblock.cpp 2008-08-05 20:52:03 UTC (rev 245)
@@ -17,7 +17,7 @@
// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-
+#include <climits>
#include "ncl/nxsunalignedblock.h"
#include "ncl/nxsreader.h"
More information about the Phylobase-commits
mailing list