You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2016/01/22 22:06:44 UTC
trafficserver git commit: TS-4099: build fixes
Repository: trafficserver
Updated Branches:
refs/heads/master 20c24cf84 -> 67cc19efe
TS-4099: build fixes
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/67cc19ef
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/67cc19ef
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/67cc19ef
Branch: refs/heads/master
Commit: 67cc19efe82176dad25e50a7a5c4c5d5bcca5655
Parents: 20c24cf
Author: James Peach <jp...@apache.org>
Authored: Fri Jan 22 12:55:11 2016 -0800
Committer: James Peach <jp...@apache.org>
Committed: Fri Jan 22 12:55:11 2016 -0800
----------------------------------------------------------------------
cmd/traffic_manager/metrics.cc | 2 +-
lib/bindings/lua.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/67cc19ef/cmd/traffic_manager/metrics.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_manager/metrics.cc b/cmd/traffic_manager/metrics.cc
index 9608a60..220466f 100644
--- a/cmd/traffic_manager/metrics.cc
+++ b/cmd/traffic_manager/metrics.cc
@@ -182,7 +182,7 @@ metrics_register_evaluator(lua_State *L)
const char *chunk;
Evaluator *eval;
EvaluatorList *evaluators;
- BindingInstance *binding = BindingInstance::self(L);
+ BindingInstance *binding;
// The metric name is the first upvalue (from the record creation closure).
metric = lua_tostring(L, lua_upvalueindex(1));
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/67cc19ef/lib/bindings/lua.h
----------------------------------------------------------------------
diff --git a/lib/bindings/lua.h b/lib/bindings/lua.h
index 8314df6..c968ec0 100644
--- a/lib/bindings/lua.h
+++ b/lib/bindings/lua.h
@@ -62,7 +62,7 @@ lua_newuserobject(lua_State *L)
return new (ptr) T();
}
- return nullptr;
+ return (T *)NULL;
}
#endif /* LUA_H_7A9F5CCE_01C6_45C3_987A_FDCC1F437AA2 */