Browse Source

Fixed extra diffs added by the rebasing proccess.

pull/1/head
triton 13 years ago
parent
commit
2923a262a3
  1. 6
      src/Generator/CodeGenerator.cs
  2. 24
      src/Generator/Generators/CLI/CLIHelpers.cs
  3. 6
      src/Generator/Generators/CLI/CLISourcesTemplate.cs
  4. 2
      src/Generator/Types/TypeMap.cs

6
src/Generator/CodeGenerator.cs

@ -44,13 +44,9 @@ namespace Cxxi @@ -44,13 +44,9 @@ namespace Cxxi
{
Library = library,
Verbose = false,
<<<<<<< HEAD
IncludeDirs = options.IncludeDirs
FileName = file,
=======
IncludeDirs = options.IncludeDirs,
FileName = file,
Defines = options.Defines,
>>>>>>> 7304ce4... Wire -Ddefine support.
toolSetToUse = options.toolset2use
};

24
src/Generator/Generators/CLI/CLIHelpers.cs

@ -404,30 +404,20 @@ namespace Cxxi.Generators.CLI @@ -404,30 +404,20 @@ namespace Cxxi.Generators.CLI
public void GenerateStart()
{
if( Transform == null)
<<<<<<< HEAD
if (Transform == null)
{
WriteLine("//----------------------------------------------------------------------------");
WriteLine("// This is autogenerated code by cxxi-generator.");
WriteLine("// Do not edit this file or all your changes will be lost after re-generation.");
WriteLine("//----------------------------------------------------------------------------");
if( FileExtension == "cpp" )
WriteLine(@"#include ""interop.h"" // marshalString");
=======
{
WriteLine("//----------------------------------------------------------------------------");
WriteLine("// This is autogenerated code by cxxi-generator.");
WriteLine("// Do not edit this file or all your changes will be lost after re-generation.");
WriteLine("//----------------------------------------------------------------------------");
if( FileExtension == "cpp" )
if (FileExtension == "cpp")
WriteLine(@"#include ""../interop.h"" // marshalString");
>>>>>>> 02a2243... Add _wrapper suffix to autogenerated files, so would not conflict with normal headers/sources.
}else
}
else
{
Transform.GenerateStart(this);
}
}
public void GenerateAfterNamespaces()

6
src/Generator/Generators/CLI/CLISourcesTemplate.cs

@ -12,15 +12,9 @@ namespace Cxxi.Generators.CLI @@ -12,15 +12,9 @@ namespace Cxxi.Generators.CLI
{
GenerateStart();
<<<<<<< HEAD
WriteLine("#include \"{0}.h\"",
Path.GetFileNameWithoutExtension(Module.FileName));
=======
WriteLine("#include \"{0}{1}.h\"",
Path.GetFileNameWithoutExtension(Module.FileName),
CLIGenerator.WrapperSuffix );
NewLine();
>>>>>>> 02a2243... Add _wrapper suffix to autogenerated files, so would not conflict with normal headers/sources.
GenerateForwardReferenceHeaders();
NewLine();

2
src/Generator/Types/TypeMap.cs

@ -94,7 +94,7 @@ namespace Cxxi.Types @@ -94,7 +94,7 @@ namespace Cxxi.Types
var attrs = typeMap.GetCustomAttributes(typeof(TypeMapAttribute));
if (attrs == null) continue;
foreach (var attr in attrs)
foreach (TypeMapAttribute attr in attrs)
{
Console.WriteLine("Found typemap: {0}", attr.Type);
TypeMaps[attr.Type] = typeMap;

Loading…
Cancel
Save