reapack

commit 502542a1c05b05f79767d30e6a0fe8894dc176d0
parent d4f3671b2cd82b31e784f2a00229ce7deadbcf70
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Thu, 17 Mar 2016 20:53:54 -0700

make the browser branch build on windows

Diffstat:
M
src/browser.cpp
 | 
12
+++++++-----
M
src/browser.hpp
 | 
2
+-
M
src/package.cpp
 | 
2
++

3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/browser.cpp b/src/browser.cpp
@@ -225,7 +225,7 @@ void Browser::onContextMenu(HWND target, const int x, const int y)
     menu.disable(versionIndex);
   else {
     const auto &versions = entry->package->versions();
-    int verIndex = versions.size();
+    int verIndex = (int)versions.size();
     for(const Version *ver : versions | boost::adaptors::reversed) {
       const UINT actionIndex = versionMenu.addAction(
         make_autostring(ver->name()).c_str(), --verIndex | (ACTION_VERSION << 8));
@@ -267,10 +267,10 @@ void Browser::selectionMenu()
 
   Menu menu;
 
-  menu.addAction("&Install/update selection", ACTION_LATEST_ALL);
-  menu.addAction("&Reinstall selection", ACTION_REINSTALL_ALL);
-  menu.addAction("&Uninstall selection", ACTION_UNINSTALL_ALL);
-  menu.addAction("&Clear queued action", ACTION_RESET_ALL);
+  menu.addAction(AUTO_STR("&Install/update selection"), ACTION_LATEST_ALL);
+  menu.addAction(AUTO_STR("&Reinstall selection"), ACTION_REINSTALL_ALL);
+  menu.addAction(AUTO_STR("&Uninstall selection"), ACTION_UNINSTALL_ALL);
+  menu.addAction(AUTO_STR("&Clear queued action"), ACTION_RESET_ALL);
 
   if(!m_list->hasSelection())
     menu.disableAll();
@@ -442,6 +442,8 @@ string Browser::getValue(const Column col, const Entry &entry) const
   case RemoteColumn:
     return pkg ? pkg->category()->index()->name() : regEntry.remote;
   }
+
+  return {}; // for MSVC
 }
 
 bool Browser::match(const Entry &entry) const
diff --git a/src/browser.hpp b/src/browser.hpp
@@ -62,7 +62,7 @@ private:
     const Version *latest;
     const Version *current;
 
-    bool test(Flag f) const { return flags & f; }
+    bool test(Flag f) const { return (flags & f) != 0; }
   };
 
   enum Column {
diff --git a/src/package.cpp b/src/package.cpp
@@ -48,6 +48,8 @@ string Package::displayType(const Type type)
   case EffectType:
     return "Effect";
   }
+
+  return {}; // MSVC is stupid
 }
 
 Package::Package(const Type type, const string &name, Category *cat)