Update of /cvsroot/simspark/simspark/spark/zeitgeist
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21072/zeitgeist
Modified Files:
class.h core.cpp object.cpp zeitgeist-config.in zeitgeist.cpp
Log Message:
merge from projectx branch
Index: core.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/core.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** core.cpp 15 Mar 2007 07:26:31 -0000 1.3
--- core.cpp 17 Jun 2007 13:38:39 -0000 1.4
***************
*** 39,44 ****
#include <sstream>
! #ifdef HAVE_CONFIG_H
! #include <config.h>
#endif
--- 39,44 ----
#include <sstream>
! #if HAVE_CONFIG_H
! #include <sparkconfig.h>
#endif
***************
*** 163,167 ****
void Core::CatchSignal(int sig_num)
{
- #ifdef __linux__
if (sig_num != SIGSEGV)
{
--- 163,166 ----
***************
*** 171,174 ****
--- 170,174 ----
cerr << "(Core) caught signal " << sig_num << endl;
+ #ifdef __linux__
// retrieve the name of our executable without access to argc and
// argv (this works only with linux)
***************
*** 206,213 ****
free (strings);
cerr << "(Core) exit" << endl;
exit(1);
- #endif
}
--- 206,213 ----
free (strings);
+ #endif
cerr << "(Core) exit" << endl;
exit(1);
}
Index: object.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/object.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** object.cpp 5 Dec 2005 20:59:18 -0000 1.1
--- object.cpp 17 Jun 2007 13:38:39 -0000 1.2
***************
*** 86,89 ****
--- 86,90 ----
boost::shared_ptr<Core> Object::GetCore() const
{
+ // if (mClass.get() == 0) std::cerr << "mClass.get() == 0: " << GetName() << '\n';
assert(mClass.get() != NULL);
boost::shared_ptr<Core> core = mClass->GetCore();
Index: zeitgeist.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/zeitgeist.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** zeitgeist.cpp 15 Mar 2007 07:26:31 -0000 1.2
--- zeitgeist.cpp 17 Jun 2007 13:38:39 -0000 1.3
***************
*** 40,44 ****
return;
}
!
mCore->GetScriptServer()->SetInitRelPathPrefix(relPathPrefix);
RunInitScript(dotName);
--- 40,44 ----
return;
}
!
mCore->GetScriptServer()->SetInitRelPathPrefix(relPathPrefix);
RunInitScript(dotName);
Index: zeitgeist-config.in
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/zeitgeist-config.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** zeitgeist-config.in 25 Dec 2005 14:55:52 -0000 1.2
--- zeitgeist-config.in 17 Jun 2007 13:38:39 -0000 1.3
***************
*** 99,105 ****
if test "$echo_libtool" = "yes" ; then
if test "@debug@" = "true"; then
! convlib="libzeitgeist_debug.la"
else
! convlib="libzeitgeist.la"
fi
echo @libdir@/simspark/$convlib
--- 99,108 ----
if test "$echo_libtool" = "yes" ; then
if test "@debug@" = "true"; then
! convlib="libzeitgeist_debug.la"
else
! convlib="libzeitgeist.la"
! fi
! if test `uname -s` = "Darwin"; then
! convlib="$convlib -framework Carbon"
fi
echo @libdir@/simspark/$convlib
Index: class.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/class.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** class.h 22 Jan 2006 12:14:57 -0000 1.2
--- class.h 17 Jun 2007 13:38:39 -0000 1.3
***************
*** 33,45 ****
#ifdef HAVE_CONFIG_H
! #include <config.h>
#endif
- #ifdef HAVE_HASH_MAP
- #include <hash_map>
- #else
#include <map>
- #endif
-
#include <string>
#include <vector>
--- 33,40 ----
#ifdef HAVE_CONFIG_H
! #include <sparkconfig.h>
#endif
#include <map>
#include <string>
#include <vector>
***************
*** 153,161 ****
/** defines a mapping from member names to command procedures */
- #ifdef HAVE_HASH_MAP
- typedef std::hash_map<std::string, TCmdProc> TCommandMap;
- #else
typedef std::map<std::string, TCmdProc> TCommandMap;
- #endif
private:
--- 148,152 ----
|
