Mercurial > hg > truffle

diff src/cpu/sparc/vm/frame_sparc.hpp @ 7066:7d815d842ee0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Christian Haeubl <haeubl@ssw.jku.at>
date Fri, 23 Nov 2012 11:50:27 +0100
parents da91efe96a93
children cd3d6a6b95d9
line wrap: on
line diff
--- a/src/cpu/sparc/vm/frame_sparc.hpp	Fri Nov 23 11:40:17 2012 +0100
+++ b/src/cpu/sparc/vm/frame_sparc.hpp	Fri Nov 23 11:50:27 2012 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
@@ -264,7 +264,7 @@
   };
 
  private:
-  constantPoolCacheOop* interpreter_frame_cpoolcache_addr() const;
+  ConstantPoolCache** interpreter_frame_cpoolcache_addr() const;
 
 #ifndef CC_INTERP