From: Peter Levine <plevine457@gmail.com>
Date: Wed, 11 Oct 2017 02:28:23 +0000 (-0400)
Subject: net-analyzer/postal: fix building with GCC-6.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3ad75b7f6b6dd1d577919e16e5a5ed2c97486b60;p=gentoo.git

net-analyzer/postal: fix building with GCC-6.

Closes: https://bugs.gentoo.org/595084
Closes: https://github.com/gentoo/gentoo/pull/5912
Package-Manager: Portage-2.3.10, Repoman-2.3.3
---

diff --git a/net-analyzer/postal/files/03_postal-0.70-c++0x-integrated.patch b/net-analyzer/postal/files/03_postal-0.70-c++0x-integrated.patch
index 9ad6a036dcda..448af31a8966 100644
--- a/net-analyzer/postal/files/03_postal-0.70-c++0x-integrated.patch
+++ b/net-analyzer/postal/files/03_postal-0.70-c++0x-integrated.patch
@@ -36,7 +36,7 @@ diff -NrU5 postal-0.69.orig/bhmusers.h postal-0.69/bhmusers.h
  #include <string>
  #include "conf.h"
  
-+#ifdef HAVE_STDCXX_0X
++#if (defined HAVE_STDCXX_0X) || (__cplusplus >= 201103L)
 +#include <unordered_map>
 +#include <tr1/functional_hash.h>
 +#else
@@ -58,7 +58,7 @@ diff -NrU5 postal-0.69.orig/bhmusers.h postal-0.69/bhmusers.h
    int sync_time;
  } BHM_DATA;
  
-+#ifdef HAVE_STDCXX_0X
++#if (defined HAVE_STDCXX_0X) || (__cplusplus >= 201103L)
 +typedef unordered_map<string, BHM_DATA , hash<string> > NAME_MAP;
 +#else
  namespace __gnu_cxx
@@ -237,7 +237,7 @@ diff -NrU5 postal-0.69.orig/smtp.h postal-0.69/smtp.h
  #include <cstring>
  #include <time.h>
  #include "conf.h"
-+#ifdef HAVE_STDCXX_0X
++#if (defined HAVE_STDCXX_0X) || (__cplusplus >= 201103L)
 +#include <unordered_map>
 +#else
  #ifdef HAVE_EXT_HASH_MAP
@@ -258,7 +258,7 @@ diff -NrU5 postal-0.69.orig/smtp.h postal-0.69/smtp.h
    }
  };
  
-+#ifdef HAVE_STDCXX_0X
++#if (defined HAVE_STDCXX_0X) || (__cplusplus >= 201103L)
 +typedef unordered_map<unsigned long, string *, hash<unsigned long>, eqlng> NAME_MAP;
 +#else
  typedef hash_map<unsigned long, string *, hash<unsigned long>, eqlng> NAME_MAP;