3party/protobuf-c
0
0
Fork 0
mirror of https://github.com/protobuf-c/protobuf-c.git synced 2024-12-27 13:31:02 +08:00
Code Issues Projects Releases Wiki Activity

Add std:: to some types

Browse Source 
This is required for compilation to succeed on debian jessie with g++
6.3.0.
This commit is contained in:
Fredrik Gustafsson 2018-03-11 08:57:46 +01:00
parent dac1a65fea
commit 034e603d2a
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
protoc-c/c_file.h
View File

@ -104,7 +104,7 @@ class FileGenerator {
scoped_array<scoped_ptr<ExtensionGenerator> > extension_generators_;
// E.g. if the package is foo.bar, package_parts_ is {"foo", "bar"}.
vector<string> package_parts_;
std::vector<string> package_parts_;
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FileGenerator);
};

8
protoc-c/c_generator.cc
View File

@ -80,13 +80,13 @@ namespace c {
// "foo=bar,baz,qux=corge"
// parses to the pairs:
// ("foo", "bar"), ("baz", ""), ("qux", "corge")
void ParseOptions(const string& text, vector<pair<string, string> >* output) {
vector<string> parts;
void ParseOptions(const string& text, std::vector<std::pair<string, string> >* output) {
std::vector<string> parts;
SplitStringUsing(text, ",", &parts);
for (unsigned i = 0; i < parts.size(); i++) {
string::size_type equals_pos = parts[i].find_first_of('=');
pair<string, string> value;
std::pair<string, string> value;
if (equals_pos == string::npos) {
value.first = parts[i];
value.second = "";
@ -105,7 +105,7 @@ bool CGenerator::Generate(const FileDescriptor* file,
const string& parameter,
OutputDirectory* output_directory,
string* error) const {
vector<pair<string, string> > options;
std::vector<std::pair<string, string> > options;
ParseOptions(parameter, &options);
// -----------------------------------------------------------------

12
protoc-c/c_helpers.cc
View File

@ -177,7 +177,7 @@ string ToCamel(const string &name) {
}
string FullNameToLower(const string &full_name) {
vector<string> pieces;
std::vector<string> pieces;
SplitStringUsing(full_name, ".", &pieces);
string rv = "";
for (unsigned i = 0; i < pieces.size(); i++) {
@ -188,7 +188,7 @@ string FullNameToLower(const string &full_name) {
return rv;
}
string FullNameToUpper(const string &full_name) {
vector<string> pieces;
std::vector<string> pieces;
SplitStringUsing(full_name, ".", &pieces);
string rv = "";
for (unsigned i = 0; i < pieces.size(); i++) {
@ -199,7 +199,7 @@ string FullNameToUpper(const string &full_name) {
return rv;
}
string FullNameToC(const string &full_name) {
vector<string> pieces;
std::vector<string> pieces;
SplitStringUsing(full_name, ".", &pieces);
string rv = "";
for (unsigned i = 0; i < pieces.size(); i++) {
@ -214,7 +214,7 @@ void PrintComment (io::Printer* printer, string comment)
{
if (!comment.empty())
{
vector<string> comment_lines;
std::vector<string> comment_lines;
SplitStringUsing (comment, "\r\n", &comment_lines);
printer->Print ("/*\n");
for (int i = 0; i < comment_lines.size(); i++)
@ -503,8 +503,8 @@ void SplitStringToIteratorUsing(const string& full,
void SplitStringUsing(const string& full,
const char* delim,
vector<string>* result) {
std::back_insert_iterator< vector<string> > it(*result);
std::vector<string>* result) {
std::back_insert_iterator< std::vector<string> > it(*result);
SplitStringToIteratorUsing(full, delim, it);
}