projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change the order of the modules - magick++ is the last resort, other than the custom...
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
node.cpp
diff --git
a/synfig-core/trunk/src/synfig/node.cpp
b/synfig-core/trunk/src/synfig/node.cpp
index
01aabeb
..
d4029e3
100644
(file)
--- a/
synfig-core/trunk/src/synfig/node.cpp
+++ b/
synfig-core/trunk/src/synfig/node.cpp
@@
-2,7
+2,7
@@
/*! \file node.cpp
** \brief Template File
**
/*! \file node.cpp
** \brief Template File
**
-** $Id
: node.cpp,v 1.5 2005/01/07 03:29:12 darco Exp
$
+** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@
-22,8
+22,6
@@
/* === H E A D E R S ======================================================= */
/* === H E A D E R S ======================================================= */
-#define HASH_MAP_H <ext/hash_map>
-
#ifdef USING_PCH
# include "pch.h"
#else
#ifdef USING_PCH
# include "pch.h"
#else
@@
-32,11
+30,10
@@
#endif
#include "node.h"
#endif
#include "node.h"
-#include "
proto/
nodebase.h"
+#include "nodebase.h"
#ifdef HASH_MAP_H
#include HASH_MAP_H
#ifdef HASH_MAP_H
#include HASH_MAP_H
-using namespace __gnu_cxx;
#else
#include <map>
#endif
#else
#include <map>
#endif
@@
-83,7
+80,7
@@
extern clock_t _clock();
/* === G L O B A L S ======================================================= */
#ifdef HASH_MAP_H
/* === G L O B A L S ======================================================= */
#ifdef HASH_MAP_H
-typedef
hash_map
<GUID,Node*,GUIDHash> GlobalNodeMap;
+typedef
HASH_MAP_CLASS
<GUID,Node*,GUIDHash> GlobalNodeMap;
#else
typedef map<GUID,Node*> GlobalNodeMap;
#endif
#else
typedef map<GUID,Node*> GlobalNodeMap;
#endif
@@
-118,6
+115,14
@@
refresh_node(synfig::Node* node, GUID old_guid)
/* === M E T H O D S ======================================================= */
/* === 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)
{
void
TimePoint::absorb(const TimePoint& x)
{
@@
-165,6
+170,7
@@
TimePointSet::insert(const TimePoint& x)
Node::Node():
guid_(0),
bchanged(true),
Node::Node():
guid_(0),
bchanged(true),
+ time_last_changed_(__sys_clock()),
deleting_(false)
{
#ifndef BE_FRUGAL_WITH_GUIDS
deleting_(false)
{
#ifndef BE_FRUGAL_WITH_GUIDS