trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sor...@apache.org
Subject [trafficserver] branch 6.2.x updated: TS-4397: Fix build on i386 caused by type mismatch
Date Tue, 03 May 2016 20:16:40 GMT
This is an automated email from the ASF dual-hosted git repository.

sorber pushed a commit to branch 6.2.x
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

The following commit(s) were added to refs/heads/6.2.x by this push:
       new  b5317c9   TS-4397: Fix build on i386 caused by type mismatch
b5317c9 is described below

commit b5317c9ee8812f6be65c0b7f215393e62fb6fe2e
Author: Felix Bünemann <buenemann@louis.info>
AuthorDate: Sat Apr 30 08:09:24 2016 +0200

    TS-4397: Fix build on i386 caused by type mismatch
    
    It seems lua_Integer is 32-Bit on i386 while it's 54-Bit on x86-64
    causing the existing code to fail with:
    
    metrics.cc: In function ‘bool metrics_binding_initialize(BindingInstance&)’:
    metrics.cc:339:58: error: call of overloaded ‘bind_constant(const char [20], int64_t)’
is ambiguous
       binding.bind_constant("metrics.update.pass", int64_t(0));
    
    This closes #607
    
    (cherry picked from commit 81c395beb7ebd47c458e799927cac4414c8b5378)
---
 cmd/traffic_manager/metrics.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/traffic_manager/metrics.cc b/cmd/traffic_manager/metrics.cc
index 8049d3f..dfe0834 100644
--- a/cmd/traffic_manager/metrics.cc
+++ b/cmd/traffic_manager/metrics.cc
@@ -336,7 +336,7 @@ metrics_binding_initialize(BindingInstance &binding)
   binding.bind_function("metrics.cluster.sum", metrics_cluster_sum);
 
   binding.bind_constant("metrics.now.msec", timestamp_now_msec());
-  binding.bind_constant("metrics.update.pass", int64_t(0));
+  binding.bind_constant("metrics.update.pass", lua_Integer(0));
 
   // Stash a backpointer to the evaluators.
   binding.attach_ptr("evaluators", new EvaluatorList());

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <commits@trafficserver.apache.org>'].

Mime
View raw message