diff src/share/vm/ci/ciSymbol.hpp @ 2182:9569fdf936ff

Made merge compile.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Wed, 16 Feb 2011 14:21:52 +0100
parents d25d4ca69222
children 0654ee04b214
line wrap: on
line diff
--- a/src/share/vm/ci/ciSymbol.hpp	Wed Feb 16 13:47:20 2011 +0100
+++ b/src/share/vm/ci/ciSymbol.hpp	Wed Feb 16 14:21:52 2011 +0100
@@ -53,11 +53,9 @@
   ciSymbol(Symbol* s);  // normal case, for symbols not mentioned in vmSymbols
   ciSymbol(Symbol* s, vmSymbols::SID sid);   // for use with vmSymbols
 
+public:
   Symbol* get_symbol() const { return _symbol; }
 
-public:
-  symbolOop get_symbolOop() const { return (symbolOop)get_oop(); }
-
 private:
   const char* type_string() { return "ciSymbol"; }