Don't use __tostring as function name

Because names with two underscores are reserved in C++.

Author: joto

src/flex-lua-expire-output.cpp

@@ -65,7 +65,7 @@ create_expire_output(lua_State *lua_state, std::string const &default_schema,
     return new_expire_output;
 }
 
-TRAMPOLINE_WRAPPED_OBJECT(expire_output, __tostring)
+TRAMPOLINE_WRAPPED_OBJECT(expire_output, tostring)
 TRAMPOLINE_WRAPPED_OBJECT(expire_output, filename)
 TRAMPOLINE_WRAPPED_OBJECT(expire_output, maxzoom)
 TRAMPOLINE_WRAPPED_OBJECT(expire_output, minzoom)
@@ -112,7 +112,7 @@ void lua_wrapper_expire_output::init(lua_State *lua_state)
     lua_pushvalue(lua_state, -1);
     lua_setfield(lua_state, -2, "__index");
     luaX_add_table_func(lua_state, "__tostring",
-                        lua_trampoline_expire_output___tostring);
+                        lua_trampoline_expire_output_tostring);
     luaX_add_table_func(lua_state, "filename",
                         lua_trampoline_expire_output_filename);
     luaX_add_table_func(lua_state, "maxzoom",
@@ -126,7 +126,7 @@ void lua_wrapper_expire_output::init(lua_State *lua_state)
     lua_pop(lua_state, 2);
 }
 
-int lua_wrapper_expire_output::__tostring() const
+int lua_wrapper_expire_output::tostring() const
 {
     std::string const str =
         fmt::format("osm2pgsql.ExpireOutput[minzoom={},maxzoom={},filename={},"

src/flex-lua-expire-output.hpp

@@ -36,7 +36,7 @@ class lua_wrapper_expire_output : public lua_wrapper_base<expire_output_t>
     {
     }
 
-    int __tostring() const;
+    int tostring() const;
     int filename() const;
     int maxzoom() const;
     int minzoom() const;

src/flex-lua-locator.cpp

@@ -36,7 +36,7 @@ locator_t &create_locator(lua_State *lua_state,
     return new_locator;
 }
 
-TRAMPOLINE_WRAPPED_OBJECT(locator, __tostring)
+TRAMPOLINE_WRAPPED_OBJECT(locator, tostring)
 TRAMPOLINE_WRAPPED_OBJECT(locator, name)
 TRAMPOLINE_WRAPPED_OBJECT(locator, add_bbox)
 TRAMPOLINE_WRAPPED_OBJECT(locator, add_from_db)
@@ -83,7 +83,7 @@ void lua_wrapper_locator::init(lua_State *lua_state,
     lua_pushvalue(lua_state, -1);
     lua_setfield(lua_state, -2, "__index");
     luaX_add_table_func(lua_state, "__tostring",
-                        lua_trampoline_locator___tostring);
+                        lua_trampoline_locator_tostring);
     luaX_add_table_func(lua_state, "name", lua_trampoline_locator_name);
     luaX_add_table_func(lua_state, "add_bbox", lua_trampoline_locator_add_bbox);
     luaX_add_table_func(lua_state, "add_from_db",
@@ -96,7 +96,7 @@ void lua_wrapper_locator::init(lua_State *lua_state,
     lua_pop(lua_state, 2);
 }
 
-int lua_wrapper_locator::__tostring() const
+int lua_wrapper_locator::tostring() const
 {
     std::string const str{fmt::format("osm2pgsql.Locator[name={},size={}]",
                                       self().name(), self().size())};

src/flex-lua-locator.hpp

@@ -38,7 +38,7 @@ class lua_wrapper_locator : public lua_wrapper_base<locator_t>
     {
     }
 
-    int __tostring() const;
+    int tostring() const;
     int name() const;
     int add_bbox();
     int add_from_db();

src/flex-lua-table.cpp

@@ -418,7 +418,7 @@ void setup_flex_table_indexes(lua_State *lua_state, flex_table_t *table,
     lua_pop(lua_state, 1); // "indexes"
 }
 
-TRAMPOLINE_WRAPPED_OBJECT(table, __tostring)
+TRAMPOLINE_WRAPPED_OBJECT(table, tostring)
 TRAMPOLINE_WRAPPED_OBJECT(table, cluster)
 TRAMPOLINE_WRAPPED_OBJECT(table, columns)
 TRAMPOLINE_WRAPPED_OBJECT(table, name)
@@ -469,7 +469,7 @@ void lua_wrapper_table::init(lua_State *lua_state)
     lua_pushvalue(lua_state, -1);
     lua_setfield(lua_state, -2, "__index");
     luaX_add_table_func(lua_state, "__tostring",
-                        lua_trampoline_table___tostring);
+                        lua_trampoline_table_tostring);
     luaX_add_table_func(lua_state, "insert", lua_trampoline_table_insert);
     luaX_add_table_func(lua_state, "name", lua_trampoline_table_name);
     luaX_add_table_func(lua_state, "schema", lua_trampoline_table_schema);
@@ -479,7 +479,7 @@ void lua_wrapper_table::init(lua_State *lua_state)
     lua_pop(lua_state, 2);
 }
 
-int lua_wrapper_table::__tostring() const
+int lua_wrapper_table::tostring() const
 {
     std::string const str{fmt::format("osm2pgsql.Table[{}]", self().name())};
     luaX_pushstring(lua_state(), str);

src/flex-lua-table.hpp

@@ -36,7 +36,7 @@ class lua_wrapper_table : public lua_wrapper_base<flex_table_t>
     {
     }
 
-    int __tostring() const;
+    int tostring() const;
     int cluster() const;
     int columns() const;
     int name() const;