Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 20cfd074b9b7
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1a6ee07a1fa6
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 18, 2016

  1. Copy the full SHA
    8bc2092 View commit details
  2. Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    1a6ee07 View commit details
Original file line number Diff line number Diff line change
@@ -120,6 +120,7 @@ public synchronized DynamicObject replicateEncoding(Encoding encoding, String na
public Encoding getLocaleEncoding() {
String localeEncodingName;
try {
assert LangInfo.CODESET.defined();
localeEncodingName = context.getNativePlatform().getPosix().nl_langinfo(LangInfo.CODESET.intValue());
}
catch (UnsupportedOperationException e) {
Original file line number Diff line number Diff line change
@@ -514,7 +514,7 @@ public int flock(int fd, int constant) {

}

@CoreMethod(names = "major", isModuleFunction = true, required = 1, lowerFixnum = 1, unsafe = UnsafeGroup.IO)
@CoreMethod(names = "major", isModuleFunction = true, required = 1, unsafe = UnsafeGroup.IO)
public abstract static class MajorNode extends CoreMethodArrayArgumentsNode {

@Specialization
@@ -528,7 +528,7 @@ public int major(long dev) {
}
}

@CoreMethod(names = "minor", isModuleFunction = true, required = 1, lowerFixnum = 1, unsafe = UnsafeGroup.IO)
@CoreMethod(names = "minor", isModuleFunction = true, required = 1, unsafe = UnsafeGroup.IO)
public abstract static class MinorNode extends CoreMethodArrayArgumentsNode {

@Specialization