Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10618 in orxonox.OLD for trunk/src/lib/util


Ignore:
Timestamp:
Apr 4, 2007, 12:13:53 PM (18 years ago)
Author:
bknecht
Message:

merged cleanup into trunk (only improvements)

Location:
trunk
Files:
3 deleted
8 edited
8 copied

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1616OrxonoxPlayability.kdevses
        1717OrxonoxPlayability.kdevelop.pcs
         18orxonox.backtrace
         19orxonox.kdevses
         20orxonox.kdevelop.pcs

  • trunk/src/lib/util

    • Property svn:ignore set to
      .deps
      Makefile
      Makefile.in
      *.a

  • trunk/src/lib/util/Makefile.am

    r9869 r10618  
    2929                filesys/net_link.cc \
    3030                \
    31                 threading.cc \
     31                threads/thread.cc \
    3232                timer.cc
    3333
    … …  
    6363                filesys/net_link.h \
    6464                \
    65                 threading.h \
     65                threads/threading.h \
     66                threads/thread.h \
     67                threads/mutex.h \
     68                threads/mutex_locker.h \
     69                \
    6670                timer.h \
    6771                \
    … …  
    7781                loading/dynamic_loader.h \
    7882                \
    79                 count_pointer.h \
    80                 list.h
     83                count_pointer.h

  • trunk/src/lib/util/debug_buffer.cc

    r9869 r10618  
    2020#include "debug.h"
    2121#include "compiler.h"
    22 #include "threading.h"
     22#include "threads/mutex_locker.h"
    2323
    2424/**
    … …  
    6464  static OrxThread::Mutex DebugBuffer__bufferMutex;
    6565
    66   OrxThread::MutexLock bufferLock(&DebugBuffer__bufferMutex);
     66  OrxThread::MutexLocker bufferLock(&DebugBuffer__bufferMutex);
    6767
    6868  va_list arguments;

  • trunk/src/lib/util/filesys/net_link.cc

    r9406 r10618  
    1717#include "debug.h"
    1818
     19#include "threads/mutex_locker.h"
    1920
    2021#ifdef __OSX__
    … …  
    4546int NetLink::openupInBrowser(void* url)
    4647{
    47   OrxThread::MutexLock lock(&NetLink::_mutex);
     48  OrxThread::MutexLocker lock(&NetLink::_mutex);
    4849
    4950  std::string URL = *(std::string*)url;
    … …  
    6970void NetLink::setDefaultBrowser(const std::string& browserName)
    7071{
    71   OrxThread::MutexLock lock(&NetLink::_mutex);
     72  OrxThread::MutexLocker lock(&NetLink::_mutex);
    7273  NetLink::_defaultBrowser = browserName;
    7374}

  • trunk/src/lib/util/filesys/net_link.h

    r9406 r10618  
    1919#include <list>
    2020
    21 #include "threading.h"
     21#include "threads/mutex.h"
    2222
    2323//! NetLink is a File and Link executer for Internet Links

  • trunk/src/lib/util/loading/game_loader.cc

    r9869 r10618  
    2323#include "debug.h"
    2424#include "campaign.h"
     25#include "compiler.h"
    2526
    2627#include "key_mapper.h"

  • trunk/src/lib/util/loading/game_loader.h

    r9869 r10618  
    99//#include "stdincl.h"
    1010#include "story_def.h"
    11 #include "comincl.h"
    1211#include "event_listener.h"
    1312
Note: See TracChangeset for help on using the changeset viewer.