Author: Carlos Lopez <[email protected]>
Date: Wed Mar 28 16:02:45 2012 +0200
I needed those changed to build in clang compiler. Ulong is not a C++ keyword.
---
synfig-core/src/synfig/canvas.cpp | 4 ++--
synfig-core/src/synfig/loadcanvas.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/synfig-core/src/synfig/canvas.cpp
b/synfig-core/src/synfig/canvas.cpp
index d0d6ede..5d2c466 100644
--- a/synfig-core/src/synfig/canvas.cpp
+++ b/synfig-core/src/synfig/canvas.cpp
@@ -1428,13 +1428,13 @@ Canvas::register_external_canvas(String file_name,
Handle canvas)
void
Canvas::show_externals(String file, int line, String text) const
{
- printf(" .----- (externals for %lx '%s')\n | %s:%d %s\n",
ulong(this), get_name().c_str(), file.c_str(), line, text.c_str());
+ printf(" .----- (externals for %lx '%s')\n | %s:%d %s\n",
uintptr_t(this), get_name().c_str(), file.c_str(), line, text.c_str());
std::map<String, Handle>::iterator iter;
for (iter = externals_.begin(); iter != externals_.end(); iter++)
{
synfig::String first(iter->first);
etl::loose_handle<Canvas> second(iter->second);
- printf(" | %40s : %lx (%d)\n", first.c_str(),
ulong(&*second), second->count());
+ printf(" | %40s : %lx (%d)\n", first.c_str(),
uintptr_t(&*second), second->count());
}
printf(" `-----\n\n");
}
diff --git a/synfig-core/src/synfig/loadcanvas.cpp
b/synfig-core/src/synfig/loadcanvas.cpp
index c283ddf..0c12c85 100644
--- a/synfig-core/src/synfig/loadcanvas.cpp
+++ b/synfig-core/src/synfig/loadcanvas.cpp
@@ -2598,7 +2598,7 @@ CanvasParser::show_canvas_map(String file, int line,
String text)
{
synfig::String first(iter->first);
etl::loose_handle<Canvas> second(iter->second);
- printf(" | %40s : %lx (%d)\n", first.c_str(),
ulong(&*second), second->count());
+ printf(" | %40s : %lx (%d)\n", first.c_str(),
uintptr_t(&*second), second->count());
}
printf(" `-----\n\n");
}
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl
