From 666f27787bef6f3f7f0a2db0b13a17863ea5decc Mon Sep 17 00:00:00 2001 From: XinGang Li Date: Sat, 23 Feb 2013 17:35:31 +0800 Subject: [PATCH 1/2] Use path.join instead of string concatenation. --- tests/run_tests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/run_tests.py b/tests/run_tests.py index 24db67b47..128ded2fa 100755 --- a/tests/run_tests.py +++ b/tests/run_tests.py @@ -72,8 +72,8 @@ def main(): argv.append('-v') argv.append('-v') - dirname = os.path.dirname(sys.argv[0]) - argv.extend(['-w', dirname+'/python_tests']) + dirname = os.path.dirname(sys.argv[0]) + argv.extend(['-w', os.path.join(dirname,'python_tests')]) if not nose.run(argv=argv, plugins=[TodoPlugin(), Doctest()]): sys.exit(1) From a10855da759189a0258dae9d9c12e0dbb2c8b438 Mon Sep 17 00:00:00 2001 From: XinGang Li Date: Sat, 23 Feb 2013 22:38:16 +0800 Subject: [PATCH 2/2] fix _MSC_VER typo. --- include/mapnik/enumeration.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/mapnik/enumeration.hpp b/include/mapnik/enumeration.hpp index 3592bec13..9b61c7e3e 100644 --- a/include/mapnik/enumeration.hpp +++ b/include/mapnik/enumeration.hpp @@ -320,7 +320,7 @@ operator>>(std::istream & is, mapnik::enumeration & e) /** Helper macro. Creates a typedef. * @relates mapnik::enumeration */ -#ifdef _MSC_VER_ +#ifdef _MSC_VER #define DEFINE_ENUM( name, e) \ template enumeration; \ typedef enumeration name