mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 01:36:01 +02:00
Code Issues Wiki Activity

Fix Compilation Errors

Browse source 
Change-Id: Ie3b0facf85527370862f7a480fcbce91d0703a70
This commit is contained in:
Alvaro Sanchez-Leon 2015-03-24 11:10:44 -04:00
parent dc57ba11a4
commit 43bc574e90
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/IToken.java
View file

@ -96,8 +96,8 @@ public interface IToken {
*/ */
int tGT_in_SHIFTR= 5201; int tGT_in_SHIFTR= 5201;
/** @since 5.9 */ int t_alignas = 5900; /** @since 5.10*/ int t_alignas = 5900;
/** @since 5.9 */ int t_alignof = 5901; /** @since 5.10*/ int t_alignof = 5901;
/** @deprecated use {@link #tAND} */ @Deprecated int t_and = 54; /** @deprecated use {@link #tAND} */ @Deprecated int t_and = 54;
/** @deprecated use {@link #tAMPERASSIGN} */ @Deprecated int t_and_eq = 55; /** @deprecated use {@link #tAMPERASSIGN} */ @Deprecated int t_and_eq = 55;
int t_asm = 56; int t_asm = 56;

3
memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java
View file

@ -837,8 +837,7 @@ public class MemoryBrowser extends ViewPart implements IDebugContextListener, IM
public IDebugTarget getDebugTarget() { return null; } public IDebugTarget getDebugTarget() { return null; }
public ILaunch getLaunch() { return null; } public ILaunch getLaunch() { return null; }
public String getModelIdentifier() { return null; } public String getModelIdentifier() { return null; }
@SuppressWarnings("rawtypes") public <T> T getAdapter(Class<T> adapter) { return null; }
public Object getAdapter(Class adapter) { return null; }
}); });
} }

8
memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRendering.java
View file

@ -1384,8 +1384,8 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe
* @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class) * @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class)
*/ */
@Override @Override
@SuppressWarnings("rawtypes") @SuppressWarnings({ "unchecked" })
public Object getAdapter(Class adapter) public <T> T getAdapter(Class<T> adapter)
{ {
if(adapter == IWorkbenchAdapter.class) 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) if (adapter == IMemoryBlockConnection.class)
@ -1447,7 +1447,7 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe
} }
}; };
} }
return fConnection; return (T) fConnection;
} }
return super.getAdapter(adapter); return super.getAdapter(adapter);