changeset 1788:33a54060190d

Merge
author twisti
date Thu, 09 Sep 2010 01:43:48 -0700
parents 84713fd87632 (diff) f9883ee8ce39 (current diff)
children a83b0246bb77
files
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/sparc/vm/frame_sparc.hpp	Wed Sep 08 20:28:57 2010 -0700
+++ b/src/cpu/sparc/vm/frame_sparc.hpp	Thu Sep 09 01:43:48 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
@@ -263,8 +263,7 @@
   };
 
  private:
-
-  constantPoolCacheOop* frame::interpreter_frame_cpoolcache_addr() const;
+  constantPoolCacheOop* interpreter_frame_cpoolcache_addr() const;
 
 #ifndef CC_INTERP