Revision: 8313
http://playerstage.svn.sourceforge.net/playerstage/?rev=8313&view=rev
Author: rtv
Date: 2009-10-20 16:55:31 +0000 (Tue, 20 Oct 2009)
Log Message:
-----------
fixed basename definition to suit gcc4
Modified Paths:
--------------
code/stage/trunk/libstage/stage.hh
code/stage/trunk/libstage/worldfile.cc
code/stage/trunk/replace/basename.c
code/stage/trunk/replace/replace.h
code/stage/trunk/todo.txt
code/stage/trunk/worlds/fasr.world
Modified: code/stage/trunk/libstage/stage.hh
===================================================================
--- code/stage/trunk/libstage/stage.hh 2009-10-18 15:31:25 UTC (rev 8312)
+++ code/stage/trunk/libstage/stage.hh 2009-10-20 16:55:31 UTC (rev 8313)
@@ -976,13 +976,9 @@
stg_usec_t time; // time that event occurs
Model* mod; // model to update
- /** Update the model appropriately, based on the event type. */
- //void Execute();
- //static const char* TypeStr( type_t type );
bool operator<( const Event& other ) const;
- // bool operator==( const Event& other ) const;
};
-
+
std::vector<std::priority_queue<Event> > event_queues;
void Enqueue( unsigned int queue_num, stg_usec_t delay, Model* mod );
Modified: code/stage/trunk/libstage/worldfile.cc
===================================================================
--- code/stage/trunk/libstage/worldfile.cc 2009-10-18 15:31:25 UTC (rev
8312)
+++ code/stage/trunk/libstage/worldfile.cc 2009-10-20 16:55:31 UTC (rev
8313)
@@ -96,7 +96,7 @@
char *token = strtok(stagepath, ":");
char* fullpath = new char[PATH_MAX];
char *tmp = strdup(filename);
- char *base = basename(tmp);
+ const char *base = basename(tmp);
while (token != NULL) {
// for each part of the path, try it:
memset( fullpath, 0, PATH_MAX);
Modified: code/stage/trunk/replace/basename.c
===================================================================
--- code/stage/trunk/replace/basename.c 2009-10-18 15:31:25 UTC (rev 8312)
+++ code/stage/trunk/replace/basename.c 2009-10-20 16:55:31 UTC (rev 8313)
@@ -32,14 +32,12 @@
# define basename gnu_basename
#endif
-
-char *
-basename (filename)
- const char *filename;
+const char * basename( const char *filename )
{
char *p = strrchr (filename, '/');
return p ? p + 1 : (char *) filename;
}
+
#ifdef _LIBC
libc_hidden_def (basename)
#endif
Modified: code/stage/trunk/replace/replace.h
===================================================================
--- code/stage/trunk/replace/replace.h 2009-10-18 15:31:25 UTC (rev 8312)
+++ code/stage/trunk/replace/replace.h 2009-10-20 16:55:31 UTC (rev 8313)
@@ -91,7 +91,7 @@
#endif // !HAVE_DIRNAME
#if !HAVE_BASENAME
- char * basename (const char* filename);
+ const char * basename (const char* filename);
#else
#include <libgen.h> // for basename(3)
#endif // !HAVE_BASENAME
Modified: code/stage/trunk/todo.txt
===================================================================
--- code/stage/trunk/todo.txt 2009-10-18 15:31:25 UTC (rev 8312)
+++ code/stage/trunk/todo.txt 2009-10-20 16:55:31 UTC (rev 8313)
@@ -8,12 +8,14 @@
linux 8.89
OS X 7.75
11.05 (rev 8210)
+ 10.15 (rev 8295)
fasr.world
----------
linux 16.36
OS X 16.20 (rev 7949)
19.94 (rev 8210 - new event queue is slower but more powerful and
elegant)
+ 14.5 (rev 8295) threads: 6: 13.7 3: 13.4
MBA 17.3
MBA 23.2
Modified: code/stage/trunk/worlds/fasr.world
===================================================================
--- code/stage/trunk/worlds/fasr.world 2009-10-18 15:31:25 UTC (rev 8312)
+++ code/stage/trunk/worlds/fasr.world 2009-10-20 16:55:31 UTC (rev 8313)
@@ -15,7 +15,7 @@
resolution 0.02
-threads 0
+threads 3
# configure the GUI window
window
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
