changeset 182:e0ca65f5ecd0

Irccd: various fixes for MSVC
author David Demelier <markand@malikania.fr>
date Wed, 01 Jun 2016 12:05:32 +0200
parents 2b4864b2b5f2
children 166f589e30e5
files extern/gtest/CMakeLists.txt lib/irccd/mod-elapsed-timer.cpp lib/irccd/mod-file.cpp plugins/logger/logger.js
diffstat 4 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/extern/gtest/CMakeLists.txt	Tue May 31 22:23:19 2016 +0200
+++ b/extern/gtest/CMakeLists.txt	Wed Jun 01 12:05:32 2016 +0200
@@ -19,6 +19,7 @@
 project(gtest)
 
 irccd_define_library(
+	LOCAL
 	TARGET extern-gtest
 	SOURCES src/gtest-all.cc
 	PUBLIC_INCLUDES ${gtest_SOURCE_DIR}/include
--- a/lib/irccd/mod-elapsed-timer.cpp	Tue May 31 22:23:19 2016 +0200
+++ b/lib/irccd/mod-elapsed-timer.cpp	Wed Jun 01 12:05:32 2016 +0200
@@ -38,7 +38,7 @@
 		duk::StackAssert sa(ctx);
 
 		duk::push(ctx, duk::This());
-		duk::putProperty<void *>(ctx, -1, Signature, timer);
+		duk::putProperty(ctx, -1, Signature, static_cast<void *>(timer));
 		duk::pop(ctx);
 	}
 
--- a/lib/irccd/mod-file.cpp	Tue May 31 22:23:19 2016 +0200
+++ b/lib/irccd/mod-file.cpp	Wed Jun 01 12:05:32 2016 +0200
@@ -617,7 +617,7 @@
 	duk::StackAssert sa(ctx);
 
 	duk::push(ctx, duk::This());
-	duk::putProperty<void *>(ctx, -1, Signature, fp);
+	duk::putProperty(ctx, -1, Signature, static_cast<void *>(fp));
 	duk::pop(ctx);
 }
 
@@ -626,7 +626,7 @@
 	duk::StackAssert sa(ctx, 1);
 
 	duk::push(ctx, duk::Object());
-	duk::putProperty<void *>(ctx, -1, Signature, fp);
+	duk::putProperty(ctx, -1, Signature, static_cast<void *>(fp));
 	duk::getGlobal<void>(ctx, Prototype);
 	duk::setPrototype(ctx, -2);
 }
--- a/plugins/logger/logger.js	Tue May 31 22:23:19 2016 +0200
+++ b/plugins/logger/logger.js	Wed Jun 01 12:05:32 2016 +0200
@@ -104,7 +104,7 @@
 	Logger.debug("opening: " + path);
 
 	var str = Util.format(Plugin.format[fmt], args);
-	var file = new File(path, "wa");
+	var file = new File(path, "a");
 
 	file.write(str + "\n");
 }