Fix compliation with gcc 4.7

This commit is contained in:
Thomas Goyne 2012-11-15 15:55:38 -08:00
parent 89fef06d6b
commit b055abae44
6 changed files with 9 additions and 9 deletions

View File

@ -3,7 +3,7 @@ AC_PREREQ(2.57)
###################
# Required packages
###################
m4_define([boost_required_version], [1.50.0])
m4_define([boost_required_version], [1.49.0])
m4_define([curl_required_version], [7.18.2])
m4_define([ffms2_required_version], [2.16])
m4_define([fftw3_required_version], [3.3])

View File

@ -116,7 +116,7 @@ CalltipProvider::CalltipProvider() {
if (proto.has_parens)
p.text.back() = ')';
protos.emplace(std::move(tag_name), std::move(p));
protos.insert(make_pair(tag_name, p));
}
}

View File

@ -23,8 +23,6 @@
#include "../../universalchardet/nsCharSetProber.h"
#include <boost/range/algorithm.hpp>
namespace agi {
namespace charset {
@ -97,7 +95,7 @@ UCDetect::UCDetect(const std::string &file)
throw UnknownCharset("Unknown character set.");
typedef std::pair<float, std::string> const& result;
boost::sort(list, [](result lft, result rgt) { return lft.first > rgt.first; });
sort(begin(list), end(list), [](result lft, result rgt) { return lft.first > rgt.first; });
}
}

View File

@ -71,7 +71,8 @@ void Thesaurus::Lookup(std::string const& word, std::vector<Entry> *out) {
std::string temp;
getline(*dat, temp);
std::vector<std::string> header;
boost::split(header, conv->Convert(temp), _1 == '|');
std::string converted(conv->Convert(temp));
boost::split(header, converted, _1 == '|');
if (header.size() != 2) return;
int meanings = atoi(header[1].c_str());
@ -79,7 +80,8 @@ void Thesaurus::Lookup(std::string const& word, std::vector<Entry> *out) {
for (int i = 0; i < meanings; ++i) {
std::vector<std::string> line;
getline(*dat, temp);
boost::split(line, conv->Convert(temp), _1 == '|');
std::string converted(conv->Convert(temp));
boost::split(line, converted, _1 == '|');
// The "definition" is just the part of speech plus the word it's
// giving synonyms for (which may not be the passed word)

View File

@ -112,7 +112,7 @@ void DialogAutosave::Populate(std::map<wxString, AutosaveFile> &files_map, std::
auto it = files_map.find(name);
if (it == files_map.end())
it = files_map.emplace(name, name).first;
it = files_map.insert(std::make_pair(name, name)).first;
it->second.versions.emplace_back(wxFileName(directory, fn).GetFullPath(), date, wxString::Format(name_fmt, date.Format()));
} while (dir.GetNext(&fn));
}

View File

@ -180,7 +180,7 @@ void DialogSpellChecker::OnIgnore(wxCommandEvent&) {
}
void DialogSpellChecker::OnIgnoreAll(wxCommandEvent&) {
auto_ignore.emplace(from_wx(orig_word->GetValue()));
auto_ignore.insert(from_wx(orig_word->GetValue()));
FindNext();
}