Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3231 for code/branches


Ignore:
Timestamp:
Jun 23, 2009, 9:59:04 PM (16 years ago)
Author:
rgrieder
Message:

Build fixes: Classes should export symbols with _CoreExport and functions with return values should return something.

Location:
code/branches/netp6/src
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • code/branches/netp6/src/core/CorePrereqs.h

    r3230 r3231  
    200200
    201201// Boost
    202 namespace boost {
     202namespace boost
     203{
    203204    namespace filesystem
    204205    {

  • code/branches/netp6/src/core/Thread.cc

    r3230 r3231  
    3535#include <boost/thread/thread_time.hpp>
    3636
    37 #include "core/Functor.h"
    3837#include "util/Sleep.h"
     38#include "Functor.h"
    3939
    4040namespace orxonox

  • code/branches/netp6/src/core/Thread.h

    r3230 r3231  
    3030#define _Thread_H__
    3131
    32 
    3332#include "CorePrereqs.h"
    3433
    3534 namespace orxonox
    3635{
    37    
    38     class Thread
     36    class _CoreExport Thread
    3937    {
    4038    public:
    4139        Thread();
    4240        virtual ~Thread();
    43        
    44         inline  bool isWorking(){ return this->isWorking_; }
     41
     42        inline bool isWorking() { return this->isWorking_; }
    4543        void waitUntilFinished();
    4644        bool evaluateFunctor( Functor* functor );
    47        
     45
    4846    private:
    4947        void            threadLoop();
    … …  
    5553        boost::mutex*   communicationMutex_;
    5654    };
    57    
    58 }
    5955
     56 }
    6057
    61 #endif
     58#endif /* _Thread_H__ */

  • code/branches/netp6/src/core/ThreadPool.cc

    r3230 r3231  
    2828
    2929#include "ThreadPool.h"
    30 
    3130#include <cassert>
    32 
    3331
    3432namespace orxonox
    3533{
    36    
    37    
     34
    3835    ThreadPool::ThreadPool()
    3936    {
    … …  
    6158            }
    6259        }
     60        return i;
    6361    }
    6462    unsigned int ThreadPool::setNrOfThreads( unsigned int nr )

  • code/branches/netp6/src/core/ThreadPool.h

    r3230 r3231  
    3030#define _ThreadPool_H__
    3131
     32#include "CorePrereqs.h"
     33
    3234#include <vector>
    33 
    3435#include "Thread.h"
    3536
    3637 namespace orxonox
    3738{
    38    
    39     class ThreadPool
     39    class _CoreExport ThreadPool
    4040    {
    4141    public:
    … …  
    5151       
    5252    private:
    53         std::vector<Thread>     threadPool_;
     53        std::vector<Thread> threadPool_;
    5454       
    5555    };
    56    
    5756}
    5857
    59 
    60 #endif
     58#endif /* _ThreadPool_H__ */

  • code/branches/netp6/src/util/UtilPrereqs.h

    r3230 r3231  
    6060// Forward declarations
    6161//-----------------------------------------------------------------------
    62 
    6362namespace Ogre
    6463{
Note: See TracChangeset for help on using the changeset viewer.