mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-28 02:11:39 +08:00
087ef910dd
* [protobuf] Update to 3.20.1 * x-add-version * [protobuf] Fix Linux build error * x-add-version * update protobuf to 3.21.2 and fix build error * x-add-version * Update protobuf.json * add version * x-add-version * fix gazebo build error * x-add-version * update gazebo version * update versions db Co-authored-by: Lily Wang <v-lilywang@microsoft.com> Co-authored-by: Victor Romero <viromer@microsoft.com>
30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
diff --git a/include/ignition/msgs/Generator.hh b/include/ignition/msgs/Generator.hh
|
|
index 62d77c6..5785e51 100644
|
|
--- a/include/ignition/msgs/Generator.hh
|
|
+++ b/include/ignition/msgs/Generator.hh
|
|
@@ -43,9 +43,9 @@ class Generator : public CodeGenerator
|
|
/// \param[in] _generatorContext Output directory.
|
|
/// \param[in] _error Unused string value
|
|
public: virtual bool Generate(const FileDescriptor *_file,
|
|
- const string &_parameter,
|
|
+ const std::string &_parameter,
|
|
OutputDirectory *_generatorContext,
|
|
- string *_error) const;
|
|
+ std::string *_error) const;
|
|
|
|
// private: GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(Generator);
|
|
};
|
|
diff --git a/src/Generator.cc b/src/Generator.cc
|
|
index f703fb8..922d637 100644
|
|
--- a/src/Generator.cc
|
|
+++ b/src/Generator.cc
|
|
@@ -67,7 +67,7 @@ Generator::~Generator()
|
|
|
|
/////////////////////////////////////////////////
|
|
bool Generator::Generate(const FileDescriptor *_file,
|
|
- const string &/*_parameter*/,
|
|
+ const std::string &/*_parameter*/,
|
|
OutputDirectory *_generatorContext,
|
|
std::string * /*_error*/) const
|
|
{
|