Skip to content

Commit

Permalink
Improved type fix
Browse files Browse the repository at this point in the history
  • Loading branch information
arnholm committed Nov 10, 2018
1 parent cacfeca commit a6f4682
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions xcsg/xcsg_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ bool xcsg_main::run_xsolid(cf_xmlNode& node,const std::string& xcsg_file)
bool web_mode = m_cmd.count("web")>0;
bool show_path = !web_mode;

int nbool = static_cast<int>(obj->nbool());
size_t nbool = obj->nbool();
cout << "...completed CSG tree: " << nbool << " boolean operations to process." << endl;
if(nbool > m_cmd.max_bool()) {
ostringstream sout;
Expand All @@ -135,7 +135,7 @@ bool xcsg_main::run_xsolid(cf_xmlNode& node,const std::string& xcsg_file)
carve_boolean csg;
try {

boolean_timer::singleton().init(nbool);
boolean_timer::singleton().init(static_cast<int>(nbool));
csg.compute(obj->create_carve_mesh(),carve::csg::CSG::OP::UNION);
boost::posix_time::time_duration ptime_diff = boost::posix_time::microsec_clock::universal_time() - time_0;
double elapsed_sec = 0.001*ptime_diff.total_milliseconds();
Expand Down Expand Up @@ -212,7 +212,7 @@ bool xcsg_main::run_xshape2d(cf_xmlNode& node,const std::string& xcsg_file)
bool web_mode = m_cmd.count("web")>0;
bool show_path = !web_mode;

int nbool = static_cast<int>(obj->nbool());
size_t nbool = obj->nbool();
cout << "...completed CSG tree: " << nbool << " boolean operations to process." << endl;
if(nbool > m_cmd.max_bool()) {
ostringstream sout;
Expand Down

0 comments on commit a6f4682

Please sign in to comment.