A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/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
c83873f
..
9220e67
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. */
/* 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,8
+6,7
@@
/* SimGrid Lua bindings */
#include "lua_private.h"
/* SimGrid Lua bindings */
#include "lua_private.h"
-#include <simgrid/host.h>
-#include <simgrid/s4u/host.hpp>
+#include "simgrid/s4u/Host.hpp"
extern "C" {
#include <lauxlib.h>
}
extern "C" {
#include <lauxlib.h>
}
@@
-36,7
+34,7
@@
sg_host_t sglua_check_host(lua_State * L, int index)
if (pi == nullptr)
XBT_ERROR("luaL_checkudata() returned nullptr");
sg_host_t ht = *pi;
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;
}
luaL_error(L, "null Host");
return ht;
}
@@
-79,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);
static int l_host_get_name(lua_State * L)
{
sg_host_t ht = sglua_check_host(L, 1);
- lua_pushstring(L, ht->
c
name());
+ lua_pushstring(L, ht->
getC
name());
return 1;
}
return 1;
}