Cleanup

src/resource/data_compiler.cpp

@@ -425,11 +425,11 @@ bool DataCompiler::compile(const char* bundle_dir, const char* platform)
 
 		StringStream ss(default_allocator());
 
-		auto begin = map::begin(_data_index);
+		auto cur = map::begin(_data_index);
 		auto end = map::end(_data_index);
-		for (; begin != end; ++begin)
+		for (; cur != end; ++cur)
 		{
-			ss << "\"" << begin->pair.first.c_str() << "\" = \"" << begin->pair.second.c_str() << "\"\n";
+			ss << "\"" << cur->pair.first.c_str() << "\" = \"" << cur->pair.second.c_str() << "\"\n";
 		}
 
 		file->write(string_stream::c_str(ss), strlen32(string_stream::c_str(ss)));

src/resource/level_resource.cpp

@@ -32,12 +32,12 @@ namespace level_resource_internal
 			JsonObject sounds_json(ta);
 			sjson::parse_object(object["sounds"], sounds_json);
 
-			auto begin = json_object::begin(sounds_json);
+			auto cur = json_object::begin(sounds_json);
 			auto end = json_object::end(sounds_json);
-			for (; begin != end; ++begin)
+			for (; cur != end; ++cur)
 			{
 				JsonObject sound(ta);
-				sjson::parse_object(begin->pair.second, sound);
+				sjson::parse_object(cur->pair.second, sound);
 
 				DynamicString sound_name(ta);
 				sjson::parse_string(sound["name"], sound_name);

src/resource/material_resource.cpp

@@ -77,13 +77,13 @@ namespace material_resource_internal
 		JsonObject object(ta);
 		sjson::parse(json, object);
 
-		auto begin = json_object::begin(object);
+		auto cur = json_object::begin(object);
 		auto end = json_object::end(object);
 
-		for (; begin != end; ++begin)
+		for (; cur != end; ++cur)
 		{
-			const FixedString key = begin->pair.first;
-			const char* value     = begin->pair.second;
+			const FixedString key = cur->pair.first;
+			const char* value     = cur->pair.second;
 
 			DynamicString texture(ta);
 			sjson::parse_string(value, texture);
@@ -112,13 +112,13 @@ namespace material_resource_internal
 		JsonObject object(ta);
 		sjson::parse(json, object);
 
-		auto begin = json_object::begin(object);
+		auto cur = json_object::begin(object);
 		auto end = json_object::end(object);
 
-		for (; begin != end; ++begin)
+		for (; cur != end; ++cur)
 		{
-			const FixedString key = begin->pair.first;
-			const char* value     = begin->pair.second;
+			const FixedString key = cur->pair.first;
+			const char* value     = cur->pair.second;
 
 			UniformHandle uh;
 			uh.uniform_handle = 0;

src/resource/mesh_resource.cpp

@@ -277,12 +277,12 @@ namespace mesh_resource_internal
 
 		MeshCompiler mc(opts);
 
-		auto begin = json_object::begin(geometries);
+		auto cur = json_object::begin(geometries);
 		auto end = json_object::end(geometries);
-		for (; begin != end; ++begin)
+		for (; cur != end; ++cur)
 		{
-			const FixedString key = begin->pair.first;
-			const char* geometry = begin->pair.second;
+			const FixedString key = cur->pair.first;
+			const char* geometry = cur->pair.second;
 			const char* node = nodes[key];
 
 			const StringId32 name(key.data(), key.length());

src/resource/physics_resource.cpp

@@ -314,13 +314,12 @@ namespace physics_config_resource_internal
 		JsonObject object(ta);
 		sjson::parse(json, object);
 
-		auto begin = json_object::begin(object);
+		auto cur = json_object::begin(object);
 		auto end = json_object::end(object);
-
-		for (; begin != end; ++begin)
+		for (; cur != end; ++cur)
 		{
-			const FixedString key = begin->pair.first;
-			const char* value     = begin->pair.second;
+			const FixedString key = cur->pair.first;
+			const char* value     = cur->pair.second;
 
 			JsonObject material(ta);
 			sjson::parse_object(value, material);
@@ -341,13 +340,12 @@ namespace physics_config_resource_internal
 		JsonObject object(ta);
 		sjson::parse(json, object);
 
-		auto begin = json_object::begin(object);
+		auto cur = json_object::begin(object);
 		auto end = json_object::end(object);
-
-		for (; begin != end; ++begin)
+		for (; cur != end; ++cur)
 		{
-			const FixedString key = begin->pair.first;
-			const char* value     = begin->pair.second;
+			const FixedString key = cur->pair.first;
+			const char* value     = cur->pair.second;
 
 			JsonObject shape(ta);
 			sjson::parse_object(value, shape);
@@ -366,13 +364,12 @@ namespace physics_config_resource_internal
 		JsonObject object(ta);
 		sjson::parse(json, object);
 
-		auto begin = json_object::begin(object);
+		auto cur = json_object::begin(object);
 		auto end = json_object::end(object);
-
-		for (; begin != end; ++begin)
+		for (; cur != end; ++cur)
 		{
-			const FixedString key = begin->pair.first;
-			const char* value     = begin->pair.second;
+			const FixedString key = cur->pair.first;
+			const char* value     = cur->pair.second;
 
 			JsonObject actor(ta);
 			sjson::parse_object(value, actor);
@@ -435,22 +432,22 @@ namespace physics_config_resource_internal
 			JsonObject object(ta);
 			sjson::parse(json, object);
 
-			auto begin = json_object::begin(object);
+			auto cur = json_object::begin(object);
 			auto end = json_object::end(object);
-			for (; begin != end; ++begin)
+			for (; cur != end; ++cur)
 			{
-				const FixedString key = begin->pair.first;
+				const FixedString key = cur->pair.first;
 				const StringId32 id   = StringId32(key.data(), key.length());
 
 				map::set(_filter_map, id, new_filter_mask());
 			}
 
-			begin = json_object::begin(object);
+			cur = json_object::begin(object);
 			end = json_object::end(object);
-			for (; begin != end; ++begin)
+			for (; cur != end; ++cur)
 			{
-				const FixedString key = begin->pair.first;
-				const char* value     = begin->pair.second;
+				const FixedString key = cur->pair.first;
+				const char* value     = cur->pair.second;
 				const StringId32 id   = StringId32(key.data(), key.length());
 
 				TempAllocator4096 ta;

src/resource/resource_manager.cpp

@@ -25,15 +25,14 @@ ResourceManager::ResourceManager(ResourceLoader& rl)
 
 ResourceManager::~ResourceManager()
 {
-	const ResourceMap::Entry* begin = sort_map::begin(_rm);
-	const ResourceMap::Entry* end = sort_map::end(_rm);
-
-	for (; begin != end; begin++)
+	auto cur = sort_map::begin(_rm);
+	auto end = sort_map::end(_rm);
+	for (; cur != end; ++cur)
 	{
-		const StringId64 type = begin->pair.first.type;
-		const StringId64 name = begin->pair.first.name;
+		const StringId64 type = cur->pair.first.type;
+		const StringId64 name = cur->pair.first.name;
 		on_offline(type, name);
-		on_unload(type, begin->pair.second.data);
+		on_unload(type, cur->pair.second.data);
 	}
 }
 

src/resource/shader_resource.cpp

@@ -706,12 +706,12 @@ namespace shader_resource_internal
 			JsonObject render_states(ta);
 			sjson::parse_object(json, render_states);
 
-			auto begin = json_object::begin(render_states);
+			auto cur = json_object::begin(render_states);
 			auto end = json_object::end(render_states);
-			for (; begin != end; ++begin)
+			for (; cur != end; ++cur)
 			{
 				JsonObject obj(ta);
-				sjson::parse_object(begin->pair.second, obj);
+				sjson::parse_object(cur->pair.second, obj);
 
 				const bool rgb_write_enable   = sjson::parse_bool(obj["rgb_write_enable"]);
 				const bool alpha_write_enable = sjson::parse_bool(obj["alpha_write_enable"]);
@@ -808,7 +808,7 @@ namespace shader_resource_internal
 				}
 
 				DynamicString key(ta);
-				key = begin->pair.first;
+				key = cur->pair.first;
 
 				DATA_COMPILER_ASSERT(!map::has(_render_states, key)
 					, _opts
@@ -825,12 +825,12 @@ namespace shader_resource_internal
 			JsonObject sampler_states(ta);
 			sjson::parse_object(json, sampler_states);
 
-			auto begin = json_object::begin(sampler_states);
+			auto cur = json_object::begin(sampler_states);
 			auto end = json_object::end(sampler_states);
-			for (; begin != end; ++begin)
+			for (; cur != end; ++cur)
 			{
 				JsonObject obj(ta);
-				sjson::parse_object(begin->pair.second, obj);
+				sjson::parse_object(cur->pair.second, obj);
 
 				const bool has_filter_min = json_object::has(obj, "filter_min");
 				const bool has_filter_mag = json_object::has(obj, "filter_mag");
@@ -903,7 +903,7 @@ namespace shader_resource_internal
 				}
 
 				DynamicString key(ta);
-				key = begin->pair.first;
+				key = cur->pair.first;
 
 				DATA_COMPILER_ASSERT(!map::has(_sampler_states, key)
 					, _opts
@@ -920,12 +920,12 @@ namespace shader_resource_internal
 			JsonObject bgfx_shaders(ta);
 			sjson::parse_object(json, bgfx_shaders);
 
-			auto begin = json_object::begin(bgfx_shaders);
+			auto cur = json_object::begin(bgfx_shaders);
 			auto end = json_object::end(bgfx_shaders);
-			for (; begin != end; ++begin)
+			for (; cur != end; ++cur)
 			{
 				JsonObject shader(ta);
-				sjson::parse_object(begin->pair.second, shader);
+				sjson::parse_object(cur->pair.second, shader);
 
 				BgfxShader bgfxshader(default_allocator());
 				if (json_object::has(shader, "includes"))
@@ -946,7 +946,7 @@ namespace shader_resource_internal
 					parse_bgfx_samplers(shader["samplers"], bgfxshader);
 
 				DynamicString key(ta);
-				key = begin->pair.first;
+				key = cur->pair.first;
 
 				DATA_COMPILER_ASSERT(!map::has(_bgfx_shaders, key)
 					, _opts
@@ -963,12 +963,12 @@ namespace shader_resource_internal
 			JsonObject bgfx_samplers(ta);
 			sjson::parse_object(json, bgfx_samplers);
 
-			auto begin = json_object::begin(bgfx_samplers);
+			auto cur = json_object::begin(bgfx_samplers);
 			auto end = json_object::end(bgfx_samplers);
-			for (; begin != end; ++begin)
+			for (; cur != end; ++cur)
 			{
 				JsonObject sampler(ta);
-				sjson::parse_object(begin->pair.second, sampler);
+				sjson::parse_object(cur->pair.second, sampler);
 
 				DynamicString sampler_state(ta);
 				sjson::parse_string(sampler["sampler_state"], sampler_state);
@@ -980,7 +980,7 @@ namespace shader_resource_internal
 					);
 
 				DynamicString key(ta);
-				key = begin->pair.first;
+				key = cur->pair.first;
 
 				DATA_COMPILER_ASSERT(!map::has(bgfxshader._samplers, key)
 					, _opts
@@ -997,19 +997,19 @@ namespace shader_resource_internal
 			JsonObject shaders(ta);
 			sjson::parse_object(json, shaders);
 
-			auto begin = json_object::begin(shaders);
+			auto cur = json_object::begin(shaders);
 			auto end = json_object::end(shaders);
-			for (; begin != end; ++begin)
+			for (; cur != end; ++cur)
 			{
 				JsonObject obj(ta);
-				sjson::parse_object(begin->pair.second, obj);
+				sjson::parse_object(cur->pair.second, obj);
 
 				ShaderPermutation shader(default_allocator());
 				sjson::parse_string(obj["bgfx_shader"], shader._bgfx_shader);
 				sjson::parse_string(obj["render_state"], shader._render_state);
 
 				DynamicString key(ta);
-				key = begin->pair.first;
+				key = cur->pair.first;
 
 				DATA_COMPILER_ASSERT(!map::has(_shaders, key)
 					, _opts
@@ -1129,12 +1129,12 @@ namespace shader_resource_internal
 
 			_opts.write(map::size(shader._samplers));
 
-			auto begin = map::begin(shader._samplers);
+			auto cur = map::begin(shader._samplers);
 			auto end = map::end(shader._samplers);
-			for (; begin != end; ++begin)
+			for (; cur != end; ++cur)
 			{
-				const DynamicString& name = begin->pair.first;
-				const DynamicString& sampler_state = begin->pair.second;
+				const DynamicString& name = cur->pair.first;
+				const DynamicString& sampler_state = cur->pair.second;
 				const SamplerState& ss = _sampler_states[sampler_state];
 
 				_opts.write(name.to_string_id());

src/resource/unit_compiler.cpp

@@ -288,13 +288,13 @@ void UnitCompiler::compile_unit_from_json(const char* json)
 			JsonObject modified_components(ta);
 			sjson::parse(prefab["modified_components"], modified_components);
 
-			auto begin = json_object::begin(modified_components);
+			auto cur = json_object::begin(modified_components);
 			auto end = json_object::end(modified_components);
-			for (; begin != end; ++begin)
+			for (; cur != end; ++cur)
 			{
-				const FixedString key = begin->pair.first;
+				const FixedString key = cur->pair.first;
 				const FixedString id(&key.data()[1], key.length()-1);
-				const char* value = begin->pair.second;
+				const char* value = cur->pair.second;
 
 				// FIXME
 				map::remove(prefab_root_components._map, id);
@@ -305,11 +305,11 @@ void UnitCompiler::compile_unit_from_json(const char* json)
 
 	if (json_object::size(prefab_root_components) > 0)
 	{
-		auto begin = json_object::begin(prefab_root_components);
+		auto cur = json_object::begin(prefab_root_components);
 		auto end = json_object::end(prefab_root_components);
-		for (; begin != end; ++begin)
+		for (; cur != end; ++cur)
 		{
-			const char* value = begin->pair.second;
+			const char* value = cur->pair.second;
 
 			TempAllocator512 ta;
 			JsonObject component(ta);
@@ -331,11 +331,10 @@ void UnitCompiler::compile_multiple_units(const char* json)
 	JsonObject obj(ta);
 	sjson::parse(json, obj);
 
-	auto begin = json_object::begin(obj);
+	auto cur = json_object::begin(obj);
 	auto end = json_object::end(obj);
-
-	for (; begin != end; ++begin)
-		compile_unit_from_json(begin->pair.second);
+	for (; cur != end; ++cur)
+		compile_unit_from_json(cur->pair.second);
 }
 
 Buffer UnitCompiler::blob()
@@ -345,12 +344,11 @@ Buffer UnitCompiler::blob()
 	ur.num_units = _num_units;
 	ur.num_component_types = 0;
 
-	auto begin = sort_map::begin(_component_data);
+	auto cur = sort_map::begin(_component_data);
 	auto end = sort_map::end(_component_data);
-
-	for (; begin != end; ++begin)
+	for (; cur != end; ++cur)
 	{
-		const u32 num = begin->pair.second._num;
+		const u32 num = cur->pair.second._num;
 
 		if (num > 0)
 			++ur.num_component_types;

src/world/material_manager.cpp

@@ -22,12 +22,11 @@ MaterialManager::MaterialManager(Allocator& a, ResourceManager& rm)
 
 MaterialManager::~MaterialManager()
 {
-	auto begin = sort_map::begin(_materials);
+	auto cur = sort_map::begin(_materials);
 	auto end = sort_map::end(_materials);
-
-	for (; begin != end; ++begin)
+	for (; cur != end; ++cur)
 	{
-		_allocator->deallocate(begin->pair.second);
+		_allocator->deallocate(cur->pair.second);
 	}
 }