diff -r 7be58576e71a -r 601146c66cad src/hotspot/share/metaprogramming/primitiveConversions.hpp --- a/src/hotspot/share/metaprogramming/primitiveConversions.hpp Fri Mar 09 08:01:25 2018 +0100 +++ b/src/hotspot/share/metaprogramming/primitiveConversions.hpp Fri Mar 09 10:46:02 2018 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2018, 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 @@ -104,7 +104,7 @@ // Give an informative error if the sizes differ. template -struct PrimitiveConversions::Cast VALUE_OBJ_CLASS_SPEC { +struct PrimitiveConversions::Cast { STATIC_ASSERT(sizeof(T) == sizeof(U)); }; @@ -113,7 +113,6 @@ struct PrimitiveConversions::Cast< T, U, true, typename EnableIf::value && IsIntegral::value>::type> - VALUE_OBJ_CLASS_SPEC { T operator()(U x) const { return cast_using_union(x); } }; @@ -125,7 +124,6 @@ typename EnableIf::value && (IsRegisteredEnum::value || IsFloatingPoint::value)>::type> - VALUE_OBJ_CLASS_SPEC { T operator()(U x) const { return cast_using_union(x); } }; @@ -137,7 +135,6 @@ typename EnableIf::value && (IsRegisteredEnum::value || IsFloatingPoint::value)>::type> - VALUE_OBJ_CLASS_SPEC { T operator()(U x) const { return cast_using_union(x); } }; @@ -147,7 +144,6 @@ struct PrimitiveConversions::Cast< T, U*, true, typename EnableIf::value>::type> - VALUE_OBJ_CLASS_SPEC { T operator()(U* x) const { return reinterpret_cast(x); } }; @@ -157,7 +153,6 @@ struct PrimitiveConversions::Cast< T*, U, true, typename EnableIf::value>::type> - VALUE_OBJ_CLASS_SPEC { T* operator()(U x) const { return reinterpret_cast(x); } };