diff src/share/vm/oops/oop.cpp @ 14909:4ca6dc0799b6

Backout jdk9 merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 01 Apr 2014 13:57:07 +0200
parents cd6b3f1a94ff
children 52b4284cb496
line wrap: on
line diff
--- a/src/share/vm/oops/oop.cpp	Tue Apr 01 14:09:03 2014 +0200
+++ b/src/share/vm/oops/oop.cpp	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -102,7 +102,7 @@
 }
 
 // When String table needs to rehash
-unsigned int oopDesc::new_hash(juint seed) {
+unsigned int oopDesc::new_hash(jint seed) {
   EXCEPTION_MARK;
   ResourceMark rm;
   int length;