Mercurial > hg > graal-jvmci-8
comparison src/share/vm/memory/metaspaceCounters.hpp @ 14237:db1ff6781ab4
Merge
author | morris |
---|---|
date | Fri, 10 Jan 2014 12:54:08 -0800 |
parents | de6a9e811145 |
children | 4ca6dc0799b6 |
comparison
equal
deleted
inserted
replaced
14196:c8907928a976 | 14237:db1ff6781ab4 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | 4 * |
5 * This code is free software; you can redistribute it and/or modify it | 5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as | 6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |