[Adonthell-commits] CVS: adonthell/src callback.h,1.5,1.6 main.cc,1.55,1.56 prefs.cc,1.29,1.30 win_event.cc,1.4,1.5

[Kai Sterker <address@hidden>]

Update of /cvsroot/adonthell/adonthell/src
In directory subversions:/tmp/cvs-serv15635/src

Modified Files:
        callback.h main.cc prefs.cc win_event.cc 
Log Message:
FIXED compile errors on MacOS X v10.2
REVERTED path changes for BeOS


Index: callback.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/callback.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** callback.h  28 Jun 2002 12:15:20 -0000      1.5
--- callback.h  16 Dec 2002 19:09:54 -0000      1.6
***************
*** 65,69 ****
    Functor0(){}
    void operator()()const
!     {
        thunk(*this);
      }
--- 65,69 ----
    Functor0(){}
    void operator()()const
!    {
        thunk(*this);
      }
***************
*** 74,78 ****
  class MemberTranslator0:public Functor0{
   public:
!   MemberTranslator0(Callee &c,const MemFunc 
&m):Functor0(thunk,&c,0,&m,sizeof(MemFunc)){}
    static void thunk(const FunctorBase &ftor)
      {
--- 74,78 ----
  class MemberTranslator0:public Functor0{
   public:
!   MemberTranslator0(Callee &c, MemFunc 
&m):Functor0(thunk,&c,0,&m,sizeof(MemFunc)){}
    static void thunk(const FunctorBase &ftor)
      {
***************
*** 140,144 ****
  class MemberTranslator0wRet:public Functor0wRet<RT>{
  public:
!       MemberTranslator0wRet(Callee &c,const MemFunc &m):
                Functor0wRet<RT>(thunk,&c,0,&m,sizeof(MemFunc)){}
        static RT thunk(const FunctorBase &ftor)
--- 140,144 ----
  class MemberTranslator0wRet:public Functor0wRet<RT>{
  public:
!       MemberTranslator0wRet(Callee &c,MemFunc &m):
                Functor0wRet<RT>(thunk,&c,0,&m,sizeof(MemFunc)){}
        static RT thunk(const FunctorBase &ftor)
***************
*** 210,214 ****
  {
    public:
!     MemberTranslator1 (Callee & c, const MemFunc & m)
          : Functor1<P1> (thunk, &c, 0, &m, sizeof (MemFunc)) { }
      static void thunk (const FunctorBase & ftor, P1 p1)
--- 210,214 ----
  {
    public:
!     MemberTranslator1 (Callee & c, MemFunc & m)
          : Functor1<P1> (thunk, &c, 0, &m, sizeof (MemFunc)) { }
      static void thunk (const FunctorBase & ftor, P1 p1)
***************
*** 258,262 ****
  {
  public:
!     MemberOf1stArgTranslator1 (const MemFunc & m) :
      Functor1 < P1 > (thunk, (void *)1, 0, &m, sizeof (MemFunc)) { }
      static void thunk (const FunctorBase & ftor, P1 p1)
--- 258,262 ----
  {
  public:
!     MemberOf1stArgTranslator1 (MemFunc & m) :
      Functor1 < P1 > (thunk, (void *)1, 0, &m, sizeof (MemFunc)) { }
      static void thunk (const FunctorBase & ftor, P1 p1)

Index: main.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/main.cc,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -r1.55 -r1.56
*** main.cc     15 Dec 2002 17:23:30 -0000      1.55
--- main.cc     16 Dec 2002 19:09:54 -0000      1.56
***************
*** 103,107 ****
  
      // init game environment
! #if !defined (WIN32) && !defined (__BEOS__)
      game::init(DATA_DIR);
  #else
--- 103,107 ----
  
      // init game environment
! #if !defined (WIN32) 
      game::init(DATA_DIR);
  #else

Index: prefs.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/prefs.cc,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** prefs.cc    15 Dec 2002 17:23:30 -0000      1.29
--- prefs.cc    16 Dec 2002 19:09:54 -0000      1.30
***************
*** 31,34 ****
--- 31,35 ----
  #include <unistd.h>
  
+ #ifndef __APPLE__
  #ifdef HAVE__GETOPT_H
  #include <_getopt.h>
***************
*** 36,39 ****
--- 37,41 ----
  #include <getopt.h>
  #endif
+ #endif // __APPLE__
  
  #include "prefs.h"
***************
*** 62,66 ****
  
      // set the path to the adonthellrc file:
! #if !defined (WIN32) && !defined (__BEOS__)
      adonthellrc = string (getenv ("HOME")) + "/.adonthell";
  #else
--- 64,68 ----
  
      // set the path to the adonthellrc file:
! #ifndef WIN32
      adonthellrc = string (getenv ("HOME")) + "/.adonthell";
  #else

Index: win_event.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/win_event.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** win_event.cc        28 Jun 2002 12:15:21 -0000      1.4
--- win_event.cc        16 Dec 2002 19:09:54 -0000      1.5
***************
*** 36,42 ****
            {
                set_callback_destroy (
!               MemberTranslator0wRet<bool, py_callback, bool 
(py_callback::*)()> (
!                   *callback, &py_callback::callback_func0ret));
!               // makeFunctor (*callback, &py_callback::callback_func0ret));
                break;
            }
--- 36,40 ----
            {
                set_callback_destroy (
!               makeFunctor (&Functor0wRet<bool>(), *callback, 
&py_callback::callback_func0ret));
                break;
            }