std::size_t -> size_t
Removing std prefix from all size_t.
This commit is contained in:
+15
-15
@@ -81,9 +81,9 @@ RString maybe_conv_pos(RString pos, RString (*conv_func)(float p))
|
||||
return pos;
|
||||
}
|
||||
|
||||
std::size_t after_slash_or_zero(RString const& s)
|
||||
size_t after_slash_or_zero(RString const& s)
|
||||
{
|
||||
std::size_t ret= s.rfind('/');
|
||||
size_t ret= s.rfind('/');
|
||||
if(ret != std::string::npos)
|
||||
{
|
||||
return ret+1;
|
||||
@@ -94,13 +94,13 @@ std::size_t after_slash_or_zero(RString const& s)
|
||||
RString add_extension_to_relative_path_from_found_file(
|
||||
RString const& relative_path, RString const& found_file)
|
||||
{
|
||||
std::size_t rel_last_slash= after_slash_or_zero(relative_path);
|
||||
std::size_t found_last_slash= after_slash_or_zero(found_file);
|
||||
size_t rel_last_slash= after_slash_or_zero(relative_path);
|
||||
size_t found_last_slash= after_slash_or_zero(found_file);
|
||||
return relative_path.Left(rel_last_slash) +
|
||||
found_file.substr(found_last_slash, std::string::npos);
|
||||
}
|
||||
|
||||
bool verify_arg_count(RString cmd, std::vector<RString>& args, std::size_t req)
|
||||
bool verify_arg_count(RString cmd, std::vector<RString>& args, size_t req)
|
||||
{
|
||||
if(args.size() < req)
|
||||
{
|
||||
@@ -113,7 +113,7 @@ bool verify_arg_count(RString cmd, std::vector<RString>& args, std::size_t req)
|
||||
typedef void (*arg_converter_t)(std::vector<RString>& args);
|
||||
|
||||
std::map<RString, arg_converter_t> arg_converters;
|
||||
std::map<RString, std::size_t> tween_counters;
|
||||
std::map<RString, size_t> tween_counters;
|
||||
std::set<RString> fields_that_are_strings;
|
||||
std::map<RString, RString> chunks_to_replace;
|
||||
|
||||
@@ -162,7 +162,7 @@ void diffuse_conv(std::vector<RString>& args)
|
||||
{
|
||||
COMMON_ARG_VERIFY(2);
|
||||
RString retarg;
|
||||
for(std::size_t i= 1; i < args.size(); ++i)
|
||||
for(size_t i= 1; i < args.size(); ++i)
|
||||
{
|
||||
retarg+= args[i];
|
||||
if(i < args.size()-1)
|
||||
@@ -308,7 +308,7 @@ void actor_template_t::store_cmd(RString const& cmd_name, RString const& full_cm
|
||||
}
|
||||
std::vector<RString> cmds;
|
||||
split(full_cmd, ";", cmds, true);
|
||||
std::size_t queue_size= 0;
|
||||
size_t queue_size= 0;
|
||||
// If someone has a simfile that uses a playcommand that pushes tween
|
||||
// states onto the queue, queue size counting will have to be made much
|
||||
// more complex to prevent that from causing an overflow.
|
||||
@@ -320,8 +320,8 @@ void actor_template_t::store_cmd(RString const& cmd_name, RString const& full_cm
|
||||
{
|
||||
for(std::vector<RString>::iterator arg= args.begin(); arg != args.end(); ++arg)
|
||||
{
|
||||
std::size_t first_nonspace= 0;
|
||||
std::size_t last_nonspace= arg->size();
|
||||
size_t first_nonspace= 0;
|
||||
size_t last_nonspace= arg->size();
|
||||
while((*arg)[first_nonspace] == ' ')
|
||||
{
|
||||
++first_nonspace;
|
||||
@@ -337,7 +337,7 @@ void actor_template_t::store_cmd(RString const& cmd_name, RString const& full_cm
|
||||
{
|
||||
conv->second(args);
|
||||
}
|
||||
std::map<RString, std::size_t>::iterator counter= tween_counters.find(args[0]);
|
||||
std::map<RString, size_t>::iterator counter= tween_counters.find(args[0]);
|
||||
if(counter != tween_counters.end())
|
||||
{
|
||||
queue_size+= counter->second;
|
||||
@@ -350,9 +350,9 @@ void actor_template_t::store_cmd(RString const& cmd_name, RString const& full_cm
|
||||
// foreground loading that ran InitCommand twice. -Kyz
|
||||
if(queue_size >= TWEEN_QUEUE_MAX)
|
||||
{
|
||||
std::size_t num_to_make= (queue_size / TWEEN_QUEUE_MAX) + 1;
|
||||
std::size_t states_per= (queue_size / num_to_make) + 1;
|
||||
std::size_t states_in_curr= 0;
|
||||
size_t num_to_make= (queue_size / TWEEN_QUEUE_MAX) + 1;
|
||||
size_t states_per= (queue_size / num_to_make) + 1;
|
||||
size_t states_in_curr= 0;
|
||||
RString this_name= cmd_name;
|
||||
std::vector<RString> curr_cmd;
|
||||
for(std::vector<RString>::iterator cmd= cmds.begin(); cmd != cmds.end(); ++cmd)
|
||||
@@ -362,7 +362,7 @@ void actor_template_t::store_cmd(RString const& cmd_name, RString const& full_cm
|
||||
split(*cmd, ",", args, true);
|
||||
if(!args.empty())
|
||||
{
|
||||
std::map<RString, std::size_t>::iterator counter= tween_counters.find(args[0]);
|
||||
std::map<RString, size_t>::iterator counter= tween_counters.find(args[0]);
|
||||
if(counter != tween_counters.end())
|
||||
{
|
||||
states_in_curr+= counter->second;
|
||||
|
||||
Reference in New Issue
Block a user