[libterralib] 01/01: rebase on alioth

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch master
in repository libterralib.

commit a683f4b031068d914353cf0019ac2bb17aee889e
Merge: 1a66d5b 62d8d4d
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Jul 15 11:59:26 2016 +0100

    rebase on alioth

 debian/control                   | 3 +--
 debian/patches/g++-6-fixes.patch | 9 ++++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --cc debian/patches/g++-6-fixes.patch
index 6abced6,0000000..0187bd7
mode 100644,000000..100644
--- a/debian/patches/g++-6-fixes.patch
+++ b/debian/patches/g++-6-fixes.patch
@@@ -1,18 -1,0 +1,21 @@@
 +Description: C++ -std11 fix needed for magics
 + Disambiguate isnan() for users of TeDefines.h
 +Author: Alastair McKinstry <mckinstry at debian.org>
 +Last-Update: 2016-05-02
 +Forwarded: no
 +Index: libterralib-4.3.0+dfsg.2/src/terralib/kernel/TeDefines.h
 +===================================================================
 +--- libterralib-4.3.0+dfsg.2.orig/src/terralib/kernel/TeDefines.h
 ++++ libterralib-4.3.0+dfsg.2/src/terralib/kernel/TeDefines.h
- @@ -205,7 +205,7 @@ const std::string TeDBVERSION = "4.0.0";
++@@ -204,8 +204,9 @@ const std::string TeDBVERSION = "4.0.0";
++   #include <float.h>
 +   #define TeISNAN( x ) _isnan( x )
 + #elif TePLATFORM == TePLATFORMCODE_LINUX || TePLATFORM == TePLATFORMCODE_AIX
-    #include <math.h>
++-  #include <math.h>
 +-  #define TeISNAN( x ) isnan( x )
- +#define TeISNAN( x ) std::isnan( x )
+++#include <cmath>
+++  using ::isnan;
+++#define TeISNAN( x ) ::isnan( x )
 + #else
 +   #error "ERROR: Unsupported platform"
 + #endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git