Browse Source

Fixed build.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5471 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Daniel Grunwald 16 years ago
parent
commit
788a578ce7
  1. 3
      src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
  2. 4
      src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultProperty.cs
  3. 8
      src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Refactoring/CodeGenerator.cs

3
src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj

@ -56,9 +56,6 @@
<Compile Include="Configuration\AssemblyInfo.cs" /> <Compile Include="Configuration\AssemblyInfo.cs" />
<EmbeddedResource Include="Resources\BuildOptions.xfrm" /> <EmbeddedResource Include="Resources\BuildOptions.xfrm" />
<EmbeddedResource Include="Resources\MyNamespaceSupportForCSharp.cs" /> <EmbeddedResource Include="Resources\MyNamespaceSupportForCSharp.cs" />
<Compile Include="EventHandlerCompletionItemProvider.cs">
<DependentUpon>CSharpBinding.addin</DependentUpon>
</Compile>
<Compile Include="Src\CSharpAdvancedHighlighter.cs" /> <Compile Include="Src\CSharpAdvancedHighlighter.cs" />
<Compile Include="Src\CSharpBackgroundCompiler.cs" /> <Compile Include="Src\CSharpBackgroundCompiler.cs" />
<Compile Include="Src\CSharpBracketSearcher.cs" /> <Compile Include="Src\CSharpBracketSearcher.cs" />

4
src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultProperty.cs

@ -87,6 +87,10 @@ namespace ICSharpCode.SharpDevelop.Dom {
{ {
DefaultProperty p = new DefaultProperty(Name, ReturnType, Modifiers, Region, BodyRegion, DeclaringType); DefaultProperty p = new DefaultProperty(Name, ReturnType, Modifiers, Region, BodyRegion, DeclaringType);
p.parameters = DefaultParameter.Clone(this.Parameters); p.parameters = DefaultParameter.Clone(this.Parameters);
p.getterModifiers = this.getterModifiers;
p.setterModifiers = this.setterModifiers;
p.getterRegion = this.getterRegion;
p.setterRegion = this.setterRegion;
p.CopyDocumentationFrom(this); p.CopyDocumentationFrom(this);
p.accessFlags = this.accessFlags; p.accessFlags = this.accessFlags;
foreach (ExplicitInterfaceImplementation eii in InterfaceImplementations) { foreach (ExplicitInterfaceImplementation eii in InterfaceImplementations) {

8
src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Refactoring/CodeGenerator.cs

@ -748,9 +748,11 @@ namespace ICSharpCode.SharpDevelop.Dom.Refactoring
#region Override member #region Override member
public virtual AttributedNode GetOverridingMethod(IMember baseMember, ClassFinder targetContext) public virtual AttributedNode GetOverridingMethod(IMember baseMember, ClassFinder targetContext)
{ {
AttributedNode node = ConvertMember(baseMember, targetContext); AbstractMember newMember = (AbstractMember)baseMember.Clone();
node.Modifier &= ~(Modifiers.Virtual | Modifiers.Abstract); newMember.Modifiers &= ~(ModifierEnum.Virtual | ModifierEnum.Abstract);
node.Modifier |= Modifiers.Override; newMember.Modifiers |= ModifierEnum.Override;
// set modifiers be before calling convert so that a body is generated
AttributedNode node = ConvertMember(newMember, targetContext);
node.Attributes.Clear(); // don't copy over attributes node.Attributes.Clear(); // don't copy over attributes
if (!baseMember.IsAbstract) { if (!baseMember.IsAbstract) {

Loading…
Cancel
Save