diff --git a/src/Luban.Job.Cfg/Source/Generate/CppCodeBinRender.cs b/src/Luban.Job.Cfg/Source/Generate/CppCodeBinRender.cs index 20157f9..4b18f53 100644 --- a/src/Luban.Job.Cfg/Source/Generate/CppCodeBinRender.cs +++ b/src/Luban.Job.Cfg/Source/Generate/CppCodeBinRender.cs @@ -89,7 +89,7 @@ class {{name}} : public {{if parent_def_type}} {{parent_def_type.cpp_full_name}} int getTypeId() const { return ID; } {{~end~}} - virtual void resolve(std::unordered_map& _tables); + virtual void resolve(std::unordered_map& _tables); }; {{x.cpp_namespace_end}} @@ -149,7 +149,7 @@ class {{name}} return it != _dataMap.end() ? it->second : nullptr; } - void resolve(std::unordered_map& _tables) + void resolve(std::unordered_map& _tables) { for(auto v : _dataList) { @@ -173,7 +173,7 @@ class {{name}} return true; } - void resolve(std::unordered_map& _tables) + void resolve(std::unordered_map& _tables) { _data->resolve(_tables); } @@ -208,9 +208,9 @@ class {{name}} {{table.cpp_full_name}} {{table.name}}; {{~end~}} - bool load(std::function loader) + bool load(std::function loader) { - std::unordered_map __tables__; + std::unordered_map __tables__; ByteBuf buf; {{~for table in tables~}} @@ -294,7 +294,7 @@ namespace {{x.top_module}} {{~end~}} } - void {{type.cpp_full_name}}::resolve(std::unordered_map& _tables) + void {{type.cpp_full_name}}::resolve(std::unordered_map& _tables) { {{~if type.parent_def_type~}} {{type.parent_def_type.name}}::resolve(_tables); diff --git a/src/Luban.Job.Cfg/Source/TypeVisitors/CppUnderingDeserializeVisitor.cs b/src/Luban.Job.Cfg/Source/TypeVisitors/CppUnderingDeserializeVisitor.cs index ed4d841..25ba442 100644 --- a/src/Luban.Job.Cfg/Source/TypeVisitors/CppUnderingDeserializeVisitor.cs +++ b/src/Luban.Job.Cfg/Source/TypeVisitors/CppUnderingDeserializeVisitor.cs @@ -64,7 +64,7 @@ namespace Luban.Job.Cfg.TypeVisitors public string Accept(TString type, string bufName, string fieldName) { - return $"if(!BYTEBUF_READ_STRING({bufName}, {fieldName})) return false;"; + return $"if(!{bufName}.readString({fieldName})) return false;"; } public string Accept(TBytes type, string bufName, string fieldName) diff --git a/src/Luban.Job.Common/Source/TypeVisitors/CppUnderingDefineTypeName.cs b/src/Luban.Job.Common/Source/TypeVisitors/CppUnderingDefineTypeName.cs index 4899bac..358474a 100644 --- a/src/Luban.Job.Common/Source/TypeVisitors/CppUnderingDefineTypeName.cs +++ b/src/Luban.Job.Common/Source/TypeVisitors/CppUnderingDefineTypeName.cs @@ -63,7 +63,7 @@ namespace Luban.Job.Common.TypeVisitors public string Accept(TString type) { - return "bright::String"; + return "std::string"; } public string Accept(TBytes type) @@ -73,7 +73,7 @@ namespace Luban.Job.Common.TypeVisitors public string Accept(TText type) { - return "bright::String"; + return "std::string"; } public string Accept(TBean type)