1.1 --- a/src/share/vm/memory/guardedMemory.hpp Mon Mar 02 13:40:40 2015 +0100
1.2 +++ b/src/share/vm/memory/guardedMemory.hpp Wed Mar 11 13:36:57 2015 -0700
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -235,7 +235,7 @@
1.11 * @return the size of the user data.
1.12 */
1.13 size_t get_user_size() const {
1.14 - assert(_base_addr, "Not wrapping any memory");
1.15 + assert(_base_addr != NULL, "Not wrapping any memory");
1.16 return get_head_guard()->get_user_size();
1.17 }
1.18
1.19 @@ -245,7 +245,7 @@
1.20 * @return the user data pointer.
1.21 */
1.22 u_char* get_user_ptr() const {
1.23 - assert(_base_addr, "Not wrapping any memory");
1.24 + assert(_base_addr != NULL, "Not wrapping any memory");
1.25 return _base_addr + sizeof(GuardHeader);
1.26 }
1.27
1.28 @@ -281,7 +281,7 @@
1.29 memset(get_user_ptr(), ch, get_user_size());
1.30 }
1.31
1.32 -public:
1.33 + public:
1.34 /**
1.35 * Return the total size required for wrapping the given user size.
1.36 *
