Changeset 59:92f74aa44868 in rrlib_finroc_core_utils-java


Ignore:
Timestamp:
10.05.2011 00:46:33 (8 years ago)
Author:
Max Reichardt <reichardt@…>
Branch:
default
Phase:
public
Convert:
svn:8ce89dfb-3813-43a8-b7d7-44859420e75d/trunk@60
Message:

Replaced boost locks and mutexes with std locks and mutexes => removed boost_thread dependency

File:
1 edited

Legend:

Unmodified
Added
Removed
  • org/finroc/serialization/DataTypeBase.java

    r56 r59  
    6464@PassByValue 
    6565@ForwardDecl( {GenericObjectManager.class, DataTypeAnnotation.class}) 
    66 @Include( {"<boost/type_traits/is_base_of.hpp>", "<boost/thread/recursive_mutex.hpp>", "<boost/thread/locks.hpp>", "rrlib/logging/definitions.h"}) 
     66@Include( {"<boost/type_traits/is_base_of.hpp>", "<mutex>", "rrlib/logging/definitions.h"}) 
    6767@CppInclude( {"<cstring>", "sSerialization.h"}) 
    6868@HAppend( {"template <typename T>", 
     
    274274 
    275275            /*Cpp 
    276             ::boost::unique_lock<boost::recursive_mutex>(getMutex()); 
     276            std::unique_lock<std::recursive_mutex>(getMutex()); 
    277277            addType(info_); 
    278278            info_->init(); 
     
    487487 
    488488    /*Cpp 
    489     static boost::recursive_mutex& getMutex() { 
    490         static boost::recursive_mutex mutex; 
     489    static std::recursive_mutex& getMutex() { 
     490        static std::recursive_mutex mutex; 
    491491        return mutex; 
    492492    } 
     
    734734    @Inline 
    735735    public <T extends DataTypeAnnotation> void addAnnotation(@Managed T ann) { 
    736         //Cpp ::boost::unique_lock<boost::recursive_mutex>(getMutex()); 
     736        //Cpp std::unique_lock<std::recursive_mutex>(getMutex()); 
    737737        //Cpp static size_t lastAnnotationIndex = 0; 
    738738        if (info != null) { 
Note: See TracChangeset for help on using the changeset viewer.