@@ -60,8 +60,8 @@ bool Generator::Generate(const FileDescriptor *_file,
6060 std::string * /* _error*/ ) const
6161{
6262 std::string delim = " .proto" ;
63- auto headerFilename = _file->name ();
64- auto sourceFilename = _file->name ();
63+ std::string headerFilename ( _file->name () );
64+ std::string sourceFilename ( _file->name () );
6565
6666 {
6767 auto pos = headerFilename.rfind (delim);
@@ -87,26 +87,27 @@ bool Generator::Generate(const FileDescriptor *_file,
8787 {
8888 const auto *desc = _file->message_type (i);
8989 std::string ptrTypes;
90+ std::string descName (desc->name ());
9091
9192 // Define std::unique_ptr types for our messages
9293 ptrTypes += " typedef std::unique_ptr<"
93- + desc-> name () + " > "
94- + desc-> name () + " UniquePtr;\n " ;
94+ + descName + " > "
95+ + descName + " UniquePtr;\n " ;
9596
9697 // Define const std::unique_ptr types for our messages
9798 ptrTypes += " typedef std::unique_ptr<const "
98- + desc-> name () + " > Const"
99- + desc-> name () + " UniquePtr;\n " ;
99+ + descName + " > Const"
100+ + descName + " UniquePtr;\n " ;
100101
101102 // Define std::shared_ptr types for our messages
102103 ptrTypes += " typedef std::shared_ptr<"
103- + desc-> name () + " > "
104- + desc-> name () + " SharedPtr;\n " ;
104+ + descName + " > "
105+ + descName + " SharedPtr;\n " ;
105106
106107 // Define const std::shared_ptr types for our messages
107108 ptrTypes += " typedef std::shared_ptr<const "
108- + desc-> name () + " > Const"
109- + desc-> name () + " SharedPtr;\n " ;
109+ + descName + " > Const"
110+ + descName + " SharedPtr;\n " ;
110111
111112 printer.PrintRaw (ptrTypes.c_str ());
112113 }
0 commit comments