You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ig...@apache.org on 2012/11/22 09:19:19 UTC
[2/2] git commit: TS-1583: also make sure this compiles under clang
TS-1583: also make sure this compiles under clang
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/90afb391
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/90afb391
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/90afb391
Branch: refs/heads/master
Commit: 90afb391dcc3aa3f2b01307c87d610cbb92ca3cf
Parents: 2a4f512
Author: Igor Galić <i....@brainsware.org>
Authored: Thu Nov 22 09:17:55 2012 +0100
Committer: Igor Galić <i....@brainsware.org>
Committed: Thu Nov 22 09:17:55 2012 +0100
----------------------------------------------------------------------
proxy/logstats.cc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/90afb391/proxy/logstats.cc
----------------------------------------------------------------------
diff --git a/proxy/logstats.cc b/proxy/logstats.cc
index bff9e5a..0e69c0c 100644
--- a/proxy/logstats.cc
+++ b/proxy/logstats.cc
@@ -55,7 +55,7 @@
#include <ext/hash_map>
#include <ext/hash_set>
#undef _BACKWARD_BACKWARD_WARNING_H
-# if (__GNUC__ <= 4 && __GNUC_MINOR__ < 7)
+# if (__GNUC__ <= 4 && __GNUC_MINOR__ < 7) && !defined(__clang__)
// hash was added to namespace std in gcc 4.7 so we use std:: for
// forward compatibility and import hash to std for backwards
// compatibility.