Merge branch 'master' into pu/mp

This commit is contained in:
Jacek Jendrzej
2017-10-02 13:56:25 +02:00
38 changed files with 68 additions and 68 deletions

View File

@@ -28,8 +28,6 @@
#include "widget/menue.h"
#include <gui/widget/hintbox.h>
using namespace std;
struct devtool_s {
std::string fmt;
std::string fsck;
@@ -65,7 +63,7 @@ class CHDDMenuHandler : public CMenuTarget
};
std::vector<hdd_s> hdd_list;
std::set<std::string> kernel_fs_list;
struct cmp_hdd_by_name: public binary_function <const struct hdd_s, const struct hdd_s, bool>
struct cmp_hdd_by_name: public std::binary_function <const struct hdd_s, const struct hdd_s, bool>
{
bool operator() (const struct hdd_s &c1, const struct hdd_s &c2)
{