Skip to content

Basic reference wrapper support#3

Open
kunitoki wants to merge 20 commits intomasterfrom
dev/reference_wrapper_support
Open

Basic reference wrapper support#3
kunitoki wants to merge 20 commits intomasterfrom
dev/reference_wrapper_support

Conversation

@kunitoki
Copy link
Copy Markdown
Owner

@kunitoki kunitoki commented Nov 23, 2020 •
edited by Copilot AI
Loading

  • Fetch latest master branch
  • Merge origin/master into dev/reference_wrapper_support
  • Resolve conflict in Source/LuaBridge/detail/CFunctions.h (keep reference_wrapper fallback logic from HEAD)
  • Resolve conflict in Source/LuaBridge/detail/Stack.h (keep reference_wrapper specialization from HEAD, add void*/const void* specializations from master)
  • Resolve conflict in Source/LuaBridge/detail/Userdata.h (keep unreachable() from HEAD)
  • Resolve conflict in Tests/Source/ClassTests.cpp (keep HEAD tests + include master's Vec/OveralignedClasses tests)
  • Fix lua_pushcclosure_x call to include debugname parameter (API changed in master)
  • Fix ReferenceWrapperRedirect test to register property as read-write
  • Regenerate amalgamation file
  • All tests pass (31/31)

⌨️ Start Copilot coding agent tasks without leaving your editor — available in VS Code, Visual Studio, JetBrains IDEs and Eclipse.

@kunitoki kunitoki changed the title basic reference wrapper support Basic reference wrapper support Jan 9, 2023
@kunitoki kunitoki added enhancement New feature or request feature labels Mar 6, 2023
@kunitoki kunitoki added the wip label Mar 18, 2023
@kunitoki
Merge branch 'master' into dev/reference_wrapper_support
49495c6 
# Conflicts:
#	Source/LuaBridge/detail/CFunctions.h
#	Source/LuaBridge/detail/FuncTraits.h
#	Tests/Source/ClassTests.cpp
@rpatters1 rpatters1 mentioned this pull request Apr 5, 2023
Closed
@kunitoki kunitoki requested review from Copilot and removed request for Copilot March 29, 2026 16:44
@kunitoki
Copy link
Copy Markdown
Owner Author

kunitoki commented Mar 29, 2026

@copilot pull master and fix conflicts

@kunitoki
Merge remote-tracking branch 'origin/master' into dev/reference_wrapp…
29d207d 
…er_support

# Conflicts:
#	Source/LuaBridge/detail/CFunctions.h
#	Source/LuaBridge/detail/Stack.h
#	Source/LuaBridge/detail/Userdata.h
#	Tests/Source/ClassTests.cpp

Co-authored-by: kunitoki <707032+kunitoki@users.noreply.github.com>
Copy link
Copy Markdown
Contributor

Copilot AI commented Mar 29, 2026

@copilot pull master and fix conflicts

Done. Merged master (up to 7c25e3f) into the branch and resolved all conflicts in CFunctions.h, Stack.h, Userdata.h, and ClassTests.cpp. Also fixed a lua_pushcclosure_x call that now requires a debug name parameter in master. Merge commit: 29d207d

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

enhancement New feature or request feature wip

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@kunitoki