Bladeren bron

Move LUWRA_MEMBER macro to usertypes.hpp

Ole 9 jaren geleden
bovenliggende
commit
6b1219abb0
2 gewijzigde bestanden met toevoegingen van 7 en 16 verwijderingen
  1. 7 9
      lib/luwra/usertypes.hpp
  2. 0 7
      lib/luwra/wrappers.hpp

+ 7 - 9
lib/luwra/usertypes.hpp

@@ -262,6 +262,13 @@ void registerUserType(
 
 LUWRA_NS_END
 
+/**
+ * Generate a user type member manifest. This is basically any type which can be constructed using a
+ * string and a `lua_CFunction`. For example `std::pair<Pushable, Pushable>`.
+ */
+#define LUWRA_MEMBER(type, name) \
+	{#name, LUWRA_WRAP(__LUWRA_NS_RESOLVE(type, name))}
+
 /**
  * Generate a `lua_CFunction` wrapper for a constructor.
  * \param type Type to instantiate
@@ -284,13 +291,4 @@ LUWRA_NS_END
 	} \
 	LUWRA_NS_END
 
-#define LUWRA_FIELD(type, name) \
-	{#name, LUWRA_WRAP_FIELD(__LUWRA_NS_RESOLVE(type, name))}
-
-#define LUWRA_METHOD(type, name) \
-	{#name, LUWRA_WRAP_METHOD(__LUWRA_NS_RESOLVE(type, name))}
-
-#define LUWRA_FUNCTION(type, name) \
-	{#name, LUWRA_WRAP_FUNCTION(__LUWRA_NS_RESOLVE(type, name))}
-
 #endif

+ 0 - 7
lib/luwra/wrappers.hpp

@@ -123,11 +123,4 @@ LUWRA_NS_END
 #define LUWRA_WRAP(entity) \
 	(&luwra::internal::GenericWrapper<decltype(&entity)>::template invoke<&entity>)
 
-/**
- * Generate a user type member manifest. This is basically any type which can be constructed using a
- * string and a `lua_CFunction`. For example `std::pair<Pushable, Pushable>`.
- */
-#define LUWRA_MEMBER(type, name) \
-	{#name, LUWRA_WRAP(__LUWRA_NS_RESOLVE(type, name))}
-
 #endif