From a2c881e36e8522d94831f5486f7408dc58321a42 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 18 Aug 2015 05:50:32 +0200 Subject: simple-mat: __inline -> inline for C++ --- opentrack/simple-mat.hpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'opentrack/simple-mat.hpp') diff --git a/opentrack/simple-mat.hpp b/opentrack/simple-mat.hpp index af23d01e..9f0911cb 100755 --- a/opentrack/simple-mat.hpp +++ b/opentrack/simple-mat.hpp @@ -52,40 +52,40 @@ struct Mat // removing them causes a compile-time error -sh 20150811 template typename std::enable_if::value, num>::type - __inline operator()(int i) const { return data[i][0]; } + inline operator()(int i) const { return data[i][0]; } template typename std::enable_if::value, num>::type - __inline operator()(int i) const { return data[0][i]; } + inline operator()(int i) const { return data[0][i]; } template typename std::enable_if::value, num&>::type - __inline operator()(int i) { return data[i][0]; } + inline operator()(int i) { return data[i][0]; } template typename std::enable_if::value, num&>::type - __inline operator()(int i) { return data[0][i]; } + inline operator()(int i) { return data[0][i]; } template typename std::enable_if::value, num>::type - __inline x() const { return operator()(0); } + inline x() const { return operator()(0); } template typename std::enable_if::value, num>::type - __inline y() const { return operator()(1); } + inline y() const { return operator()(1); } template typename std::enable_if::value, num>::type - __inline z() const { return operator()(2); } + inline z() const { return operator()(2); } template typename std::enable_if::value, num>::type - __inline w() const { return operator()(3); } + inline w() const { return operator()(3); } template typename std::enable_if::value, num&>::type - __inline x() { return operator()(0); } + inline x() { return operator()(0); } template typename std::enable_if::value, num&>::type - __inline y() { return operator()(1); } + inline y() { return operator()(1); } template typename std::enable_if::value, num&>::type - __inline z() { return operator()(2); } + inline z() { return operator()(2); } template typename std::enable_if::value, num&>::type - __inline w() { return operator()(3); } + inline w() { return operator()(3); } template typename std::enable_if::value, num>::type @@ -169,8 +169,8 @@ struct Mat return ret; } - __inline num operator()(int j, int i) const { return data[j][i]; } - __inline num& operator()(int j, int i) { return data[j][i]; } + inline num operator()(int j, int i) const { return data[j][i]; } + inline num& operator()(int j, int i) { return data[j][i]; } Mat(std::initializer_list&& list) { -- cgit v1.2.3