From 5bd43cf304999714f6e8b1c23638e7ffd0e51a74 Mon Sep 17 00:00:00 2001
From: Jeff Johnston
Date: Tue, 26 Mar 2019 17:34:16 -0400
Subject: Bug 545819 - Meson properties dialog doesn't work with meson 0.50.1

- fix meson properties page to use meson setup -h
- reenable meson ui tests
- fix CMake New Project test to wait for shell open/closes
- fix regression in EvalUnaryTypeID that is made visible by
  CMake New project test

Change-Id: Id64d4df6d9764d0c84553b5c4f73fa44149bda19
---
 .../core/dom/parser/cpp/semantics/EvalUnaryTypeID.java       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'core/org.eclipse.cdt.core')

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalUnaryTypeID.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalUnaryTypeID.java
index e08dce34c89..ff508152fbb 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalUnaryTypeID.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalUnaryTypeID.java
@@ -160,10 +160,14 @@ public class EvalUnaryTypeID extends CPPDependentEvaluation {
 		case op_sizeof:
 		case op_sizeofParameterPack:
 		case op_alignof:
-			CPPBasicType t = (CPPBasicType) CPPVisitor.get_SIZE_T().clone();
-			if (getValue().numberValue() != null)
-				t.setAssociatedNumericalValue(getValue().numberValue().longValue());
-			return t;
+			IType o = CPPVisitor.get_SIZE_T();
+			if (o instanceof CPPBasicType) {
+				CPPBasicType t = (CPPBasicType) o.clone();
+				if (getValue().numberValue() != null)
+					t.setAssociatedNumericalValue(getValue().numberValue().longValue());
+				return t;
+			}
+			return o;
 		case op_typeid:
 			return CPPVisitor.get_type_info();
 		case op_has_nothrow_copy:
-- 
cgit v1.2.3