X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fnode.cpp;h=d4029e351b76058b6157dfedfb7aa8a3cdf10dcc;hb=470708cb3278175cd21694d2317f92f83bbd28cd;hp=eaab96462ac42a8e05412e4dfcfb85846a7a0448;hpb=cc54c38609ee9745ad678e5e9b9d7d2912be9c95;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/node.cpp b/synfig-core/trunk/src/synfig/node.cpp index eaab964..d4029e3 100644 --- a/synfig-core/trunk/src/synfig/node.cpp +++ b/synfig-core/trunk/src/synfig/node.cpp @@ -22,8 +22,6 @@ /* === H E A D E R S ======================================================= */ -#define HASH_MAP_H - #ifdef USING_PCH # include "pch.h" #else @@ -32,11 +30,10 @@ #endif #include "node.h" -#include "proto/nodebase.h" +#include "nodebase.h" #ifdef HASH_MAP_H #include HASH_MAP_H -using namespace __gnu_cxx; #else #include #endif @@ -83,7 +80,7 @@ extern clock_t _clock(); /* === G L O B A L S ======================================================= */ #ifdef HASH_MAP_H -typedef hash_map GlobalNodeMap; +typedef HASH_MAP_CLASS GlobalNodeMap; #else typedef map GlobalNodeMap; #endif @@ -118,6 +115,14 @@ refresh_node(synfig::Node* node, GUID old_guid) /* === M E T H O D S ======================================================= */ +#ifdef _DEBUG +const char * +TimePoint::c_str()const +{ + return get_time().get_string().c_str(); +} +#endif + void TimePoint::absorb(const TimePoint& x) { @@ -165,6 +170,7 @@ TimePointSet::insert(const TimePoint& x) Node::Node(): guid_(0), bchanged(true), + time_last_changed_(__sys_clock()), deleting_(false) { #ifndef BE_FRUGAL_WITH_GUIDS