Revision: 77962
http://sourceforge.net/p/brlcad/code/77962
Author: starseeker
Date: 2020-12-11 15:59:56 +0000 (Fri, 11 Dec 2020)
Log Message:
-----------
More C string adjustments
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/dictSchema.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/dictSchema.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/globalRule.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/globalRule.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/classes_wrapper.cc
Modified:
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/dictSchema.cc
===================================================================
---
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/dictSchema.cc
2020-12-11 15:34:59 UTC (rev 77961)
+++
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/dictSchema.cc
2020-12-11 15:59:56 UTC (rev 77962)
@@ -57,9 +57,10 @@
_global_rules = grs;
}
-void Schema::AddProcedure(const std::string &p)
+void Schema::AddProcedure(const char *p)
{
- _procedure_list.push_back(p);
+ std::string pstr(p);
+ _procedure_list.push_back(pstr);
}
/// the whole schema
Modified:
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/dictSchema.h
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/dictSchema.h
2020-12-11 15:34:59 UTC (rev 77961)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/dictSchema.h
2020-12-11 15:59:56 UTC (rev 77962)
@@ -97,7 +97,7 @@
return _procedure_list;
}
- void AddProcedure(const std::string &p);
+ void AddProcedure(const char *p);
EntityDescLinkNode *AddEntity(EntityDescriptor *ed)
{
Modified:
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/globalRule.cc
===================================================================
---
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/globalRule.cc
2020-12-11 15:34:59 UTC (rev 77961)
+++
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/globalRule.cc
2020-12-11 15:59:56 UTC (rev 77962)
@@ -5,7 +5,7 @@
{
}
-Global_rule::Global_rule(const char *n, Schema_ptr parent_sch, const
std::string &rt)
+Global_rule::Global_rule(const char *n, Schema_ptr parent_sch, const char *rt)
: _name(n), _entities(0), _where_rules(0), _parent_schema(parent_sch),
_rule_text(rt)
{
Modified:
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/globalRule.h
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/globalRule.h
2020-12-11 15:34:59 UTC (rev 77961)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/globalRule.h
2020-12-11 15:59:56 UTC (rev 77962)
@@ -25,7 +25,7 @@
Schema_ptr _parent_schema;
Global_rule();
- Global_rule(const char *n, Schema_ptr parent_sch, const std::string
&rt);
+ Global_rule(const char *n, Schema_ptr parent_sch, const char *rt);
Global_rule(Global_rule &); // not fully implemented
virtual ~Global_rule();
Modified:
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/classes_wrapper.cc
===================================================================
---
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/classes_wrapper.cc
2020-12-11 15:34:59 UTC (rev 77961)
+++
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/classes_wrapper.cc
2020-12-11 15:59:56 UTC (rev 77962)
@@ -521,7 +521,7 @@
while(0 != (r = (Rule)DICTdo(&de))) {
fprintf(createall, " str.clear();\n");
format_for_std_stringout(createall, RULEto_string(r));
- fprintf(createall, "gr = new Global_rule(\"%s\",%s::schema, str
);\n", r->symbol.name, SCHEMAget_name(schema));
+ fprintf(createall, "gr = new Global_rule(\"%s\",%s::schema,
str.c_str() );\n", r->symbol.name, SCHEMAget_name(schema));
fprintf(createall, "%s::schema->AddGlobal_rule(gr);\n",
SCHEMAget_name(schema));
}
/**************/
@@ -538,7 +538,7 @@
while(0 != (p = (Procedure)DICTdo(&de))) {
fprintf(createall, " str.clear();\n");
format_for_std_stringout(createall, PROCto_string(p));
- fprintf(createall, "%s::schema->AddProcedure( str );\n",
SCHEMAget_name(schema));
+ fprintf(createall, "%s::schema->AddProcedure( str.c_str() );\n",
SCHEMAget_name(schema));
}
fprintf(files->classes, "\n// Schema: %s", schnm);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
