diff options
| author | Soumith Chintala <soumith@gmail.com> | 2016-11-28 08:55:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-28 08:55:17 +0300 |
| commit | 426e2989de5ef3e759b1e10efe94bd04c170efda (patch) | |
| tree | 44cf94753712611392243d867bebe6cf707870e2 | |
| parent | 765b5139bad7cbb8882969e6dd2ba6897dbb190f (diff) | |
| parent | 691a141a4ce37e3d22309d9f635dd34634d8beb5 (diff) | |
Merge pull request #851 from BTNC/win
2 trivial changes to compile with msvc
| -rw-r--r-- | lib/TH/generic/THTensorLapack.c | 2 | ||||
| -rw-r--r-- | lib/luaT/luaT.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/TH/generic/THTensorLapack.c b/lib/TH/generic/THTensorLapack.c index fb1e246..fe82cc0 100644 --- a/lib/TH/generic/THTensorLapack.c +++ b/lib/TH/generic/THTensorLapack.c @@ -605,7 +605,7 @@ void THTensor_(potrf)(THTensor *ra_, THTensor *a, const char *uplo) THLapack_(potrf)(uplo[0], n, THTensor_(data)(ra__), lda, &info); THLapackCheckWithCleanup("Lapack Error in %s : the leading minor of order %d is not positive definite", THCleanup(THTensor_(free)(ra__);), - "potrf", info); + "potrf", info, ""); THTensor_(clearUpLoTriangle)(ra__, uplo); THTensor_(freeCopyTo)(ra__, ra_); diff --git a/lib/luaT/luaT.c b/lib/luaT/luaT.c index 95166ed..2dc307a 100644 --- a/lib/luaT/luaT.c +++ b/lib/luaT/luaT.c @@ -151,7 +151,7 @@ const char* luaT_newlocalmetatable(lua_State *L, const char *tname, const char * { lua_pushcfunction(L, luaT_lua_newmetatable); lua_pushstring(L, tname); - (parent_tname ? lua_pushstring(L, parent_tname) : lua_pushnil(L)); + (parent_tname ? (void)lua_pushstring(L, parent_tname) : lua_pushnil(L)); (constructor ? lua_pushcfunction(L, constructor) : lua_pushnil(L)); (destructor ? lua_pushcfunction(L, destructor) : lua_pushnil(L)); (factory ? lua_pushcfunction(L, factory) : lua_pushnil(L)); |