Fix compilation on Windows

There are still a bunch of warning that we should remove.
This commit is contained in:
Corentin Wallez
2017-05-29 11:33:33 -07:00
committed by Corentin Wallez
parent 583e9a8f3c
commit 944b60fb75
6 changed files with 34 additions and 11 deletions

View File

@@ -210,12 +210,12 @@ class PreprocessingLoader(jinja2.BaseLoader):
for line in lines:
# The capture in the regex adds one element per block start or end so we divide by two
# there is also an extra line chunk corresponding to the line end, so we substract it.
numends = (len(self.blockend.split(line)) - 1) / 2
numends = (len(self.blockend.split(line)) - 1) // 2
indentation_level -= numends
result.append(self.remove_indentation(line, indentation_level))
numstarts = (len(self.blockstart.split(line)) - 1) / 2
numstarts = (len(self.blockstart.split(line)) - 1) // 2
indentation_level += numstarts
return '\n'.join(result)
@@ -456,6 +456,7 @@ def main():
[os.path.abspath(args.json[0])] +
[os.path.realpath(__file__)]
)
dependencies = [dependency.replace('\\', '/') for dependency in dependencies]
sys.stdout.write(output_separator.join(dependencies))
return 0
@@ -463,6 +464,7 @@ def main():
outputs = set(
[os.path.abspath(args.output_dir + os.path.sep + render.output) for render in renders]
)
outputs = [output.replace('\\', '/') for output in outputs]
sys.stdout.write(output_separator.join(outputs))
return 0

View File

@@ -18,6 +18,8 @@
#include <gmock/gmock.h>
#include <nxt/nxt.h>
#include <memory>
// An abstract base class representing a proc table so that API calls can be mocked. Most API calls
// are directly represented by a delete virtual method but others need minimal state tracking to be
// useful as mocks.