[Bf-blender-cvs] [743280a] depsgraph_refactor: Depsgraph: Attemt to fix compilation error with mingw

Sergey Sharybin noreply at git.blender.org
Fri Jan 9 15:02:28 CET 2015


Commit: 743280a8a0a5f381bced0f9431d70a48e19d7c1f
Author: Sergey Sharybin
Date:   Fri Jan 9 19:01:59 2015 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rB743280a8a0a5f381bced0f9431d70a48e19d7c1f

Depsgraph: Attemt to fix compilation error with mingw

===================================================================

M	source/blender/depsgraph/intern/depsgraph_debug.cpp

===================================================================

diff --git a/source/blender/depsgraph/intern/depsgraph_debug.cpp b/source/blender/depsgraph/intern/depsgraph_debug.cpp
index 8cb6fc2..c21d6c3 100644
--- a/source/blender/depsgraph/intern/depsgraph_debug.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_debug.cpp
@@ -376,7 +376,9 @@ static void deg_debug_graphviz_node_single(const DebugContext &ctx,
 	float priority = -1.0f;
 	if (node->type == DEPSNODE_TYPE_ID_REF) {
 		IDDepsNode *id_node = (IDDepsNode *)node;
-		name += " (Layers: " + std::to_string(id_node->layers) + ") ";
+		char buf[256];
+		BLI_snprintf(buf, sizeof(buf), " (Layers: %d)", id_node->layers);
+		name += buf;
 	}
 	if (ctx.show_eval_priority && node->tclass == DEPSNODE_CLASS_OPERATION) {
 		priority = ((OperationDepsNode *)node)->eval_priority;
@@ -410,7 +412,9 @@ static void deg_debug_graphviz_node_cluster_begin(const DebugContext &ctx,
 	string name = node->identifier().c_str();
 	if (node->type == DEPSNODE_TYPE_ID_REF) {
 		IDDepsNode *id_node = (IDDepsNode *)node;
-		name += " (Layers: " + std::to_string(id_node->layers) + ") ";
+		char buf[256];
+		BLI_snprintf(buf, sizeof(buf), " (Layers: %d)", id_node->layers);
+		name += buf;
 	}
 	deg_debug_fprintf(ctx, "// %s\n", name.c_str());
 	deg_debug_fprintf(ctx, "subgraph \"cluster_%p\" {" NL, node);
@@ -1104,7 +1108,7 @@ bool DEG_debug_consistency_check(Depsgraph *graph)
 			printf("Valency mismatch: %s, %d != %d\n",
 			       node->identifier().c_str(),
 			       node->num_links_pending, num_links_pending);
-			printf("Number of inlinks: %lu\n", node->inlinks.size());
+			printf("Number of inlinks: %d\n", (int)node->inlinks.size());
 			return false;
 		}
 	}




More information about the Bf-blender-cvs mailing list