Replace external deps w/ conan pkgs

This commit is contained in:
John Colvin committed 2022-07-01 18:06:22 -05:00
1 parent 8301fdccf4
commit 99451eb3e7
71 files changed
+339 -169

No files matched your search

+7 -7
View File
@@ -95,7 +95,7 @@ bool ConfigValueQueue::can_process(const std::string &source) {
for (size_t x = 0; x < len; ++x) {
// If there is a destination assignment underneath the source path
// Then we cannot copy the value yet
const string &dest = _vals[x].dest_key;
const std::string &dest = _vals[x].dest_key;
if (dest.compare(0, source.size(), source) == 0) {
if (dest.size() <= source.size() || dest[source.size()] == '.') {
return false;
@@ -156,7 +156,7 @@ void ConfigValueQueue::assign(
} else if (field->type() == proto::FieldDescriptor::Type::TYPE_BOOL) {
reflection->SetBool(message, field, value_to_bool(value));
} else {
string error = "Invalid type conversion in assignment to " +
std::string error = "Invalid type conversion in assignment to " +
message->GetTypeName() + "." + field->name();
throw ConfigurationException(error.c_str());
}
@@ -227,7 +227,7 @@ void ConfigValueQueue::assign_value_to_field(
case FieldDescriptor::TYPE_FIXED32:
case FieldDescriptor::TYPE_INT32:
if (value.which() == ValueType::string) {
lexical_assign<int, string>(MY_ARGS);
lexical_assign<int, std::string>(MY_ARGS);
} else {
assign<int, double>(MY_ARGS);
}
@@ -241,9 +241,9 @@ void ConfigValueQueue::assign_value_to_field(
case FieldDescriptor::TYPE_STRING:
if (value.which() == ValueType::integer ||
value.which() == ValueType::real) {
lexical_assign<string, double>(MY_ARGS);
lexical_assign<std::string, double>(MY_ARGS);
} else {
assign<string>(MY_ARGS);
assign<std::string>(MY_ARGS);
}
break;
case FieldDescriptor::TYPE_MESSAGE:
@@ -257,7 +257,7 @@ void ConfigValueQueue::assign_value_to_field(
int size = reflection->FieldSize(*message, field);
const EnumDescriptor *enum_type = field->enum_type();
const EnumValueDescriptor *enum_value =
enum_type->FindValueByName(boost::get<string>(value));
enum_type->FindValueByName(boost::get<std::string>(value));
reflection->AddEnum(message, field, enum_value);
if (index != size) {
for (int i = index; i < size; ++i) {
@@ -270,7 +270,7 @@ void ConfigValueQueue::assign_value_to_field(
} else {
const EnumDescriptor *enum_type = field->enum_type();
const EnumValueDescriptor *enum_value =
enum_type->FindValueByName(boost::get<string>(value));
enum_type->FindValueByName(boost::get<std::string>(value));
set_field(message, reflection, field, enum_value, index);
if (field->is_repeated()) {
bump_indexes(message, field, 1);