hardcoresushi
/
libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Some MSVC fixes

This commit is contained in:
Sebastian Messmer 2018-09-03 15:59:17 -07:00
parent cb96a5fc0a
commit 4778c28898
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cpp-utils/testutils/CaptureStderrRAII.h
View File

@ -22,12 +22,12 @@ public:
std::cerr.rdbuf(_oldBuffer);
}
std::string stderr() const {
std::string get_stderr() const {
return _buffer.str();
}
void EXPECT_MATCHES(const std::string &regex) {
EXPECT_THAT(stderr(), testing::MatchesRegex(".*" + regex + ".*"));
EXPECT_THAT(get_stderr(), testing::MatchesRegex(".*" + regex + ".*"));
}
private:

2
test/cryfs-cli/program_options/ProgramOptionsTest.cpp
View File

@ -11,7 +11,7 @@ namespace bf = boost::filesystem;
// This is needed for google test to work with boost::optional<boost::filesystem::path>
namespace boost {
template<> ostream& operator<< <char, std::char_traits<char>, bf::path>(ostream &stream, const optional<bf::path> &path) {
template<> inline ostream& operator<< <char, std::char_traits<char>, bf::path>(ostream &stream, const optional<bf::path> &path) {
if (path == none) {
return stream << "none";
}