fix warnings in alert_manager and fix test_resolve_links for windows

2015-04-04 19:11:14 +00:00
parent d019f3d4c3
commit 2a3a34bf8d
3 changed files with 6 additions and 6 deletions
--- a/test/test_resolve_links.cpp
+++ b/test/test_resolve_links.cpp
@@ -87,8 +87,8 @@ int test_main()
 {

 #ifndef TORRENT_DISABLE_MUTABLE_TORRENTS
-	std::string path
-		= combine_path("..", "mutable_test_torrents");
+	std::string path = combine_path(parent_path(current_working_directory())
+		, "mutable_test_torrents");

 	for (int i = 0; i < sizeof(test_torrents)/sizeof(test_torrents[0]); ++i)
 	{