Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorOleg Krasilnikov2008-04-18 04:55:03 -0400
committerOleg Krasilnikov2008-04-18 04:55:03 -0400
commit5b1f6b5408336f50d38fa6517d23087c94df70b0 (patch)
tree17ebd6107605cda74f66d2e6ac613a59e7db2619 /core
parent324a584c997587566e4c3414ee4df718add3755f (diff)
downloadorg.eclipse.cdt-5b1f6b5408336f50d38fa6517d23087c94df70b0.tar.gz
org.eclipse.cdt-5b1f6b5408336f50d38fa6517d23087c94df70b0.tar.xz
org.eclipse.cdt-5b1f6b5408336f50d38fa6517d23087c94df70b0.zip
Bug #214194 : Adding a preprocessor symbol erases previously defined ones
Diffstat (limited to 'core')
-rw-r--r--core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/SettingsSet.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/SettingsSet.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/SettingsSet.java
index c5dba340082..d9b1d99e9db 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/SettingsSet.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/SettingsSet.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Intel Corporation and others.
+ * Copyright (c) 2007, 2008 Intel Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -319,9 +319,12 @@ public class SettingsSet {
EntryNameKey key = new EntryNameKey(entry);
Object[] o = (Object[])map.get(key);
+
if(o != null && valueMatches(entry, o[1])){
mapCopy.remove(key);
levelInteger = (Integer)o[0];
+ if (! entry.isBuiltIn()) // allow overwrite existing entry,
+ levelInteger = null; // even with the same value
} else {
levelInteger = null;
}

Back to the top