Mercurial > hg > truffle
comparison src/share/vm/runtime/java.hpp @ 7066:7d815d842ee0
Merge.
author | Christian Haeubl <haeubl@ssw.jku.at> |
---|---|
date | Fri, 23 Nov 2012 11:50:27 +0100 |
parents | a1b8cf9cf970 |
children |
comparison
equal
deleted
inserted
replaced
7065:cfacf5d5bade | 7066:7d815d842ee0 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 1997, 2012, 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. |
73 friend void JDK_Version_init(); | 73 friend void JDK_Version_init(); |
74 private: | 74 private: |
75 | 75 |
76 static JDK_Version _current; | 76 static JDK_Version _current; |
77 static const char* _runtime_name; | 77 static const char* _runtime_name; |
78 static const char* _runtime_version; | |
78 | 79 |
79 // In this class, we promote the minor version of release to be the | 80 // In this class, we promote the minor version of release to be the |
80 // major version for releases >= 5 in anticipation of the JDK doing the | 81 // major version for releases >= 5 in anticipation of the JDK doing the |
81 // same thing. For example, we represent "1.5.0" as major version 5 (we | 82 // same thing. For example, we represent "1.5.0" as major version 5 (we |
82 // drop the leading 1 and use 5 as the 'major'). | 83 // drop the leading 1 and use 5 as the 'major'). |
187 } | 188 } |
188 static void set_runtime_name(const char* name) { | 189 static void set_runtime_name(const char* name) { |
189 _runtime_name = name; | 190 _runtime_name = name; |
190 } | 191 } |
191 | 192 |
193 static const char* runtime_version() { | |
194 return _runtime_version; | |
195 } | |
196 static void set_runtime_version(const char* version) { | |
197 _runtime_version = version; | |
198 } | |
199 | |
192 // Convenience methods for queries on the current major/minor version | 200 // Convenience methods for queries on the current major/minor version |
193 static bool is_jdk12x_version() { | 201 static bool is_jdk12x_version() { |
194 return current().compare_major(2) == 0; | 202 return current().compare_major(2) == 0; |
195 } | 203 } |
196 | 204 |