src/share/vm/libadt/set.hpp

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 20,37 ****
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  
! #ifndef _SET_
! #define _SET_
  // Sets - An Abstract Data Type
  
- // Should not manually include these in AVM framework. %%%%% - Ungar
- // #ifndef _PORT_
- // #include "port.hpp"
- // #endif // _PORT_
  //INTERFACE
  
  class SparseSet;
  class VectorSet;
  class ListSet;
--- 20,37 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  
! #ifndef SHARE_VM_LIBADT_SET_HPP
! #define SHARE_VM_LIBADT_SET_HPP
! 
! #include "libadt/port.hpp"
! #include "memory/allocation.hpp"
! 
  // Sets - An Abstract Data Type
  
  //INTERFACE
  
  class SparseSet;
  class VectorSet;
  class ListSet;
*** 246,251 ****
    void reset( const Set *s ) { delete impl; impl = s->iterate(elem); }
    void operator ++(void) { elem = impl->next(); }
    int test(void) { return impl->test(); }
  };
  
! #endif // _SET_
--- 246,251 ----
    void reset( const Set *s ) { delete impl; impl = s->iterate(elem); }
    void operator ++(void) { elem = impl->next(); }
    int test(void) { return impl->test(); }
  };
  
! #endif // SHARE_VM_LIBADT_SET_HPP