diff src/share/vm/runtime/reflectionUtils.hpp @ 10136:cc12becb22e7

Merge
author dcubed
date Sun, 21 Apr 2013 21:05:02 -0700
parents 5a9fa2ba85f0
children f9be75d21404
line wrap: on
line diff
--- a/src/share/vm/runtime/reflectionUtils.hpp	Sat Apr 20 19:02:11 2013 +0200
+++ b/src/share/vm/runtime/reflectionUtils.hpp	Sun Apr 21 21:05:02 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -136,10 +136,10 @@
   }
 };
 
-class FilteredField : public CHeapObj<mtInternal>  {
+class FilteredField {
  private:
   Klass* _klass;
-  int    _field_offset;
+  int      _field_offset;
 
  public:
   FilteredField(Klass* klass, int field_offset) {