diff options
| author | Mike Pall <mike> | 2020-09-22 12:01:09 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2020-09-22 12:01:09 +0200 |
| commit | 518e8cbeb435d7c294abbaded97bc1aa897e36c7 (patch) | |
| tree | c121be6e06da1786eb0c875def800b83a92e1f39 /src | |
| parent | dd5032ed844c56964347c7916db66b0eb11d8091 (diff) | |
| parent | 881d02d3117838acaf4fb844332c8e33cc95c8c5 (diff) | |
| download | luajit-518e8cbeb435d7c294abbaded97bc1aa897e36c7.tar.gz luajit-518e8cbeb435d7c294abbaded97bc1aa897e36c7.tar.bz2 luajit-518e8cbeb435d7c294abbaded97bc1aa897e36c7.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/lj_ir.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_ir.h b/src/lj_ir.h index 6116f7e5..b9da1fc5 100644 --- a/src/lj_ir.h +++ b/src/lj_ir.h | |||
| @@ -133,7 +133,7 @@ | |||
| 133 | _(XBAR, S , ___, ___) \ | 133 | _(XBAR, S , ___, ___) \ |
| 134 | \ | 134 | \ |
| 135 | /* Type conversions. */ \ | 135 | /* Type conversions. */ \ |
| 136 | _(CONV, NW, ref, lit) \ | 136 | _(CONV, N , ref, lit) \ |
| 137 | _(TOBIT, N , ref, ref) \ | 137 | _(TOBIT, N , ref, ref) \ |
| 138 | _(TOSTR, N , ref, lit) \ | 138 | _(TOSTR, N , ref, lit) \ |
| 139 | _(STRTO, N , ref, ___) \ | 139 | _(STRTO, N , ref, ___) \ |