Update travis. Refactor macros.

.travis.yml

@@ -12,9 +12,6 @@ env:
   global:
     - ARMA_VERSION="9.300.2"
     - ARMA_SRC="http://sourceforge.net/projects/arma/files/armadillo-${ARMA_VERSION}.tar.xz"
-  matrix:
-    - OPERATOR_OVERLOADING=yes
-    - OPERATOR_OVERLOADING=no
 
 before_install:
   - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
@@ -30,6 +27,6 @@ install:
 
 script:
   - phpize
-  - ./configure --enable-arma-operator=$OPERATOR_OVERLOADING
+  - ./configure --enable-arma-operator
   - make
   - make test

src/complex.cc

@@ -18,7 +18,7 @@ namespace php_arma
     }
 
     template <typename T>
-    PHP_ARMA_FUNCTION(complex, __construct, T)
+    PHP_ARMA_METHOD(complex, __construct, T)
     {
         zval *real, *imag;
         ZEND_PARSE_PARAMETERS_START(0, 2)

src/mapval.cc

@@ -24,14 +24,14 @@ namespace php_arma
     }
 
     template <typename T, bool B1, bool B2>
-    PHP_ARMA_FUNCTION(mapval, val, T, B1, B2)
+    PHP_ARMA_METHOD(mapval, val, T, B1, B2)
     {
         auto current = Z_OBJ_P(getThis());
         zval_set_scalar(return_value, get_val(current));
     }
 
     template <typename T, bool B1, bool B2>
-    PHP_ARMA_FUNCTION(mapval, setTo, T, B1, B2)
+    PHP_ARMA_METHOD(mapval, setTo, T, B1, B2)
     {
         zval *val;
         ZEND_PARSE_PARAMETERS_START(1, 1)

src/php_arma.hh

@@ -36,10 +36,7 @@ extern zend_module_entry arma_module_entry;
 #define PHP_ARMA_ME(func, flags)                          \
     ZEND_FENTRY(func, zif_##func, nullptr, flags)
 
-#define PHP_ARMA_METHODS(cls, ...)                        \
-    cls<__VA_ARGS__>::me
-
-#define PHP_ARMA_FUNCTION(cls, func, ...)                 \
+#define PHP_ARMA_METHOD(cls, func, ...)                   \
     void ZEND_FASTCALL cls<__VA_ARGS__>::zif_##func(INTERNAL_FUNCTION_PARAMETERS)
 
 /// Helper macros for class entry and object handlers