Merge pull request #44 from apple1417/master

apple1417 · web-flow · commit 0cbbbfaefe47 · 2024-09-22T17:16:17.000+12:00
rename arg to avoid shadowing member
diff --git a/src/unrealsdk/unreal/structs/fscriptdelegate.cpp b/src/unrealsdk/unreal/structs/fscriptdelegate.cpp
@@ -15,8 +15,8 @@ UObject* FScriptDelegate::get_object(void) const {
     return this->object;
 }
 
-void FScriptDelegate::set_object(UObject* object) {
-    this->object = object;
+void FScriptDelegate::set_object(UObject* obj) {
+    this->object = obj;
 }
 
 #else
diff --git a/src/unrealsdk/unreal/structs/fscriptdelegate.h b/src/unrealsdk/unreal/structs/fscriptdelegate.h
@@ -38,7 +38,7 @@ struct FScriptDelegate {
      *
      * @param object The object.
      */
-    void set_object(UObject* object);
+    void set_object(UObject* obj);
 
     /**
      * @brief Tries to convert this delegate to a bound function.

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ UObject* FScriptDelegate::get_object(void) const {`
`15`	`15`	`return this->object;`
`16`	`16`	`}`
`17`	`17`
`18`		`-void FScriptDelegate::set_object(UObject* object) {`
`19`		`- this->object = object;`
	`18`	`+void FScriptDelegate::set_object(UObject* obj) {`
	`19`	`+ this->object = obj;`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`#else`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ struct FScriptDelegate {`
`38`	`38`	`*`
`39`	`39`	`* @param object The object.`
`40`	`40`	`*/`
`41`		`- void set_object(UObject* object);`
	`41`	`+ void set_object(UObject* obj);`
`42`	`42`
`43`	`43`	`/**`
`44`	`44`	`* @brief Tries to convert this delegate to a bound function.`