# HG changeset patch
# User twisti
# Date 1284021828 25200
# Node ID 33a54060190dcf6ca180b1e847d0cde1d6e53e3b
# Parent  84713fd87632b911ea9108df5a52398e68cda0ef# Parent  f9883ee8ce39f37069ef74336d1e3c147bc30508
Merge

diff -r f9883ee8ce39 -r 33a54060190d src/cpu/sparc/vm/frame_sparc.hpp
--- 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