From 43bc574e90307a08f07e51f54793f6984f2a278f Mon Sep 17 00:00:00 2001
From: Alvaro Sanchez-Leon <alvsan09@gmail.com>
Date: Tue, 24 Mar 2015 11:10:44 -0400
Subject: [PATCH] Fix Compilation Errors

Change-Id: Ie3b0facf85527370862f7a480fcbce91d0703a70
---
 .../parser/org/eclipse/cdt/core/parser/IToken.java        | 4 ++--
 .../cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java  | 3 +--
 .../debug/ui/memory/traditional/TraditionalRendering.java | 8 ++++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/IToken.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/IToken.java
index 08b9920a950..b13d697cd9c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/IToken.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/IToken.java
@@ -96,8 +96,8 @@ public interface IToken {
 	 */
 	int tGT_in_SHIFTR= 5201;
 
-	/** @since 5.9 */ int t_alignas = 5900;
-	/** @since 5.9 */ int t_alignof = 5901;
+	/** @since 5.10*/ int t_alignas = 5900;
+	/** @since 5.10*/ int t_alignof = 5901;
 	/** @deprecated use {@link #tAND} */ @Deprecated int t_and = 54;
 	/** @deprecated use {@link #tAMPERASSIGN} */ @Deprecated int t_and_eq = 55;
 	int t_asm = 56;
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java
index 21c1584aae9..5430277cfd0 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java
@@ -837,8 +837,7 @@ public class MemoryBrowser extends ViewPart implements IDebugContextListener, IM
 			public IDebugTarget getDebugTarget() { return null; }
 			public ILaunch getLaunch() { return null; }
 			public String getModelIdentifier() { return null; }
-			@SuppressWarnings("rawtypes")
-			public Object getAdapter(Class adapter) { return null; }
+			public <T> T getAdapter(Class<T> adapter) { return null; }
 		});
 	}
 
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRendering.java b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRendering.java
index 1f27497cb8b..019abacc25d 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRendering.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRendering.java
@@ -1384,8 +1384,8 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe
      * @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class)
      */
 	@Override
-	@SuppressWarnings("rawtypes")
-	public Object getAdapter(Class adapter)
+	@SuppressWarnings({ "unchecked" })
+	public <T> T getAdapter(Class<T> adapter)
 	{
         if(adapter == IWorkbenchAdapter.class)
         {
@@ -1415,7 +1415,7 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe
                     }
                 };
             }
-            return this.fWorkbenchAdapter;
+            return (T) this.fWorkbenchAdapter;
         }
         
         if (adapter == IMemoryBlockConnection.class) 
@@ -1447,7 +1447,7 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe
 					}
 				};
 			}
-			return fConnection;
+			return (T) fConnection;
         }
 
         return super.getAdapter(adapter);