Merge branches 'master' and 'master' of github.com:simgrid/simgrid

[simgrid.git] / src / bindings / lua / lua_host.cpp

diff --git a/src/bindings/lua/lua_host.cpp b/src/bindings/lua/lua_host.cpp
index 797dade..4d4eac9 100644 (file)
--- a/src/bindings/lua/lua_host.cpp
+++ b/src/bindings/lua/lua_host.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2010, 2012-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -7,7 +6,7 @@
 /* SimGrid Lua bindings                                                     */
 
 #include "lua_private.h"
-#include <simgrid/host.h>
+#include "simgrid/s4u/Host.hpp"
 extern "C" {
 #include <lauxlib.h>
 }
@@ -32,10 +31,10 @@ sg_host_t sglua_check_host(lua_State * L, int index)
   lua_getfield(L, index, HOST_FIELDNAME);
   sg_host_t *pi = (sg_host_t *) luaL_checkudata(L, lua_gettop(L), HOST_MODULE_NAME);
   lua_pop(L, 1);
-  if (pi == NULL)
-    XBT_ERROR("luaL_checkudata() returned NULL");
+  if (pi == nullptr)
+    XBT_ERROR("luaL_checkudata() returned nullptr");
   sg_host_t ht = *pi;
-  if (!ht)
+  if (not ht)
     luaL_error(L, "null Host");
   return ht;
 }
@@ -78,7 +77,7 @@ static int l_host_get_by_name(lua_State * L)
 static int l_host_get_name(lua_State * L)
 {
   sg_host_t ht = sglua_check_host(L, 1);
-  lua_pushstring(L, sg_host_get_name(ht));
+  lua_pushstring(L, ht->cname());
   return 1;
 }
 
@@ -160,7 +159,7 @@ static const luaL_Reg host_functions[] = {
   {"destroy", l_host_destroy},
   // Bypass XML Methods
   {"set_property", console_host_set_property},
-  {NULL, NULL}
+  {nullptr, nullptr}
 };
 
 /**