Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix enums to return nil on unknown symbol #2003

Merged
merged 4 commits into from Nov 2, 2014

Conversation

Projects
None yet
2 participants
@tduehr
Copy link
Contributor

tduehr commented Sep 26, 2014

fixes #1954

@tduehr tduehr force-pushed the tduehr:enums_fix branch from ed63aed to 4cf5eb5 Oct 3, 2014

tduehr added some commits Sep 26, 2014

fix failing variadic spec
updates variadic invoker to match MRI
variadic functions may now take enum arguments

@tduehr tduehr force-pushed the tduehr:enums_fix branch from 4cf5eb5 to 7e30627 Oct 6, 2014

fix failing syslog test
also adds ffi spec for failure
@headius

This comment has been minimized.

Copy link
Member

headius commented Nov 2, 2014

There's a number of fixes here, but I'm willing to accept them as a batch since you pulled in updated FFI specs to confirm them.

headius added a commit that referenced this pull request Nov 2, 2014

Merge pull request #2003 from tduehr/enums_fix
fix enums to return nil on unknown symbol

@headius headius merged commit 8d12e83 into jruby:jruby-1_7 Nov 2, 2014

1 check failed

continuous-integration/travis-ci The Travis CI build failed
Details

@headius headius added this to the JRuby 1.7.17 milestone Nov 2, 2014

@headius headius added the ffi label Nov 2, 2014

@headius headius self-assigned this Nov 2, 2014

@tduehr

This comment has been minimized.

Copy link
Contributor Author

tduehr commented Nov 3, 2014

I'd normally not do all this together but the functionality needed tests that weren't quite in the FFI suite here yet, so i went ahead and resynced.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.