cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unbreak with clang6

Browse Source
This commit is contained in:
jasper 2018-04-08 08:35:14 +00:00
parent d569db0d84
commit 450f73d8f2
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
devel/protobuf/patches/patch-src_google_protobuf_compiler_command_line_interface_cc Normal file
View File

@ -0,0 +1,26 @@
$OpenBSD: patch-src_google_protobuf_compiler_command_line_interface_cc,v 1.1 2018/04/08 08:35:14 jasper Exp $
Unbreak with clang6
https://github.com/google/protobuf/commit/5a76e633ea9b5adb215e93fdc11e1c0c08b3fc74
Index: src/google/protobuf/compiler/command_line_interface.cc
--- src/google/protobuf/compiler/command_line_interface.cc.orig
+++ src/google/protobuf/compiler/command_line_interface.cc
@@ -781,7 +781,7 @@ bool CommandLineInterface::ParseArguments(int argc, co
// If no --proto_path was given, use the current working directory.
if (proto_path_.empty()) {
- proto_path_.push_back(make_pair<string, string>("", "."));
+ proto_path_.push_back(std::pair<string, string>("", "."));
}
// Check some errror cases.
@@ -910,7 +910,7 @@ bool CommandLineInterface::InterpretArgument(const str
cerr << disk_path << ": warning: directory does not exist." << endl;
}
- proto_path_.push_back(make_pair<string, string>(virtual_path, disk_path));
+ proto_path_.push_back(std::pair<string, string>(virtual_path, disk_path));
}
} else if (name == "-o" || name == "--descriptor_set_out") {