Browse Source

Fixed the build.

pull/266/merge
triton 11 years ago
parent
commit
fd1dc49745
  1. 12
      src/CppParser/Bindings/CSharp/i686-pc-win32/AST.cs
  2. 4
      src/Parser/Parser.cpp

12
src/CppParser/Bindings/CSharp/i686-pc-win32/AST.cs

@ -6359,7 +6359,7 @@ namespace CppSharp @@ -6359,7 +6359,7 @@ namespace CppSharp
public void* OriginalPtr;
[FieldOffset(120)]
public CppSharp.Parser.AST.MacroLocation Location;
public CppSharp.Parser.AST.MacroLocation MacroLocation;
[SuppressUnmanagedCodeSecurity]
[DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@ -6404,18 +6404,18 @@ namespace CppSharp @@ -6404,18 +6404,18 @@ namespace CppSharp
base.Dispose(disposing);
}
public CppSharp.Parser.AST.MacroLocation Location
public CppSharp.Parser.AST.MacroLocation MacroLocation
{
get
{
var __ptr = (Internal*)__Instance.ToPointer();
return __ptr->Location;
return __ptr->MacroLocation;
}
set
{
var __ptr = (Internal*)__Instance.ToPointer();
__ptr->Location = value;
__ptr->MacroLocation = value;
}
}
}
@ -6456,7 +6456,7 @@ namespace CppSharp @@ -6456,7 +6456,7 @@ namespace CppSharp
public void* OriginalPtr;
[FieldOffset(120)]
public CppSharp.Parser.AST.MacroLocation Location;
public CppSharp.Parser.AST.MacroLocation MacroLocation;
[SuppressUnmanagedCodeSecurity]
[DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@ -6565,7 +6565,7 @@ namespace CppSharp @@ -6565,7 +6565,7 @@ namespace CppSharp
public void* OriginalPtr;
[FieldOffset(120)]
public CppSharp.Parser.AST.MacroLocation Location;
public CppSharp.Parser.AST.MacroLocation MacroLocation;
[FieldOffset(148)]
public global::System.IntPtr Definition;

4
src/Parser/Parser.cpp

@ -2389,8 +2389,8 @@ void Parser::HandlePreprocessedEntities(CppSharp::AST::Declaration^ Decl, @@ -2389,8 +2389,8 @@ void Parser::HandlePreprocessedEntities(CppSharp::AST::Declaration^ Decl,
auto Entity = WalkPreprocessedEntity(Decl, PPEntity);
if (!Entity) continue;
if (Entity->Location == CppSharp::AST::MacroLocation::Unknown)
Entity->Location = macroLocation;
if (Entity->MacroLocation == CppSharp::AST::MacroLocation::Unknown)
Entity->MacroLocation = macroLocation;
}
}

Loading…
Cancel
Save