Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[outofcore] Migrate mutex, locks and cvs to C++14 #3074

Merged

Conversation

SergioRAgostinho
Copy link
Member

No description provided.

@SergioRAgostinho SergioRAgostinho added changelog: ABI break Meta-information for changelog generation c++14 module: outofcore labels May 8, 2019
@SergioRAgostinho SergioRAgostinho added this to the pcl-1.10.0 milestone May 8, 2019
@taketwo
Copy link
Member

taketwo commented May 8, 2019

In file included from /__w/1/s/outofcore/include/pcl/outofcore/octree_disk_container.h:50:0,
                 from /__w/1/s/outofcore/include/pcl/outofcore/octree_base_node.h:49,
                 from /__w/1/s/outofcore/include/pcl/outofcore/octree_base.h:46,
                 from /__w/1/s/outofcore/include/pcl/outofcore/outofcore.h:42,
                 from /__w/1/s/examples/outofcore/example_outofcore_with_lod.cpp:42:
/__w/1/s/outofcore/include/pcl/outofcore/octree_abstract_node_container.h:98:21: error: 'mutex' in namespace 'std' does not name a type
         static std::mutex rng_mutex_;
                     ^
In file included from /__w/1/s/outofcore/include/pcl/outofcore/octree_base_node.h:49:0,
                 from /__w/1/s/outofcore/include/pcl/outofcore/octree_base.h:46,
                 from /__w/1/s/outofcore/include/pcl/outofcore/outofcore.h:42,
                 from /__w/1/s/examples/outofcore/example_outofcore_with_lod.cpp:42:
/__w/1/s/outofcore/include/pcl/outofcore/octree_disk_container.h:299:21: error: 'mutex' in namespace 'std' does not name a type
         static std::mutex rng_mutex_;
                     ^
In file included from /__w/1/s/outofcore/include/pcl/outofcore/octree_base.h:46:0,
                 from /__w/1/s/outofcore/include/pcl/outofcore/outofcore.h:42,
                 from /__w/1/s/examples/outofcore/example_outofcore_with_lod.cpp:42:
/__w/1/s/outofcore/include/pcl/outofcore/octree_base_node.h:562:21: error: 'mutex' in namespace 'std' does not name a type
         static std::mutex rng_mutex_;
                     ^
In file included from /__w/1/s/outofcore/include/pcl/outofcore/octree_base.h:48:0,
                 from /__w/1/s/outofcore/include/pcl/outofcore/outofcore.h:42,
                 from /__w/1/s/examples/outofcore/example_outofcore_with_lod.cpp:42:
/__w/1/s/outofcore/include/pcl/outofcore/octree_ram_container.h:168:21: error: 'mutex' in namespace 'std' does not name a type
         static std::mutex rng_mutex_;
                     ^
In file included from /__w/1/s/outofcore/include/pcl/outofcore/outofcore_impl.h:44:0,
                 from /__w/1/s/examples/outofcore/example_outofcore_with_lod.cpp:43:
/__w/1/s/outofcore/include/pcl/outofcore/impl/monitor_queue.hpp: In member function 'DataT MonitorQueue<DataT>::pop()':
/__w/1/s/outofcore/include/pcl/outofcore/impl/monitor_queue.hpp:29:33: error: no matching function for call to 'std::condition_variable::wait(std::lock_guard<std::mutex>&)'
       item_available_.wait (lock);
                                 ^
In file included from /usr/include/c++/5/shared_mutex:40:0,
                 from /__w/1/s/outofcore/include/pcl/outofcore/octree_base.h:66,
                 from /__w/1/s/outofcore/include/pcl/outofcore/outofcore.h:42,
                 from /__w/1/s/examples/outofcore/example_outofcore_with_lod.cpp:42:
/usr/include/c++/5/condition_variable:91:5: note: candidate: void std::condition_variable::wait(std::unique_lock<std::mutex>&)
     wait(unique_lock<mutex>& __lock);
     ^
/usr/include/c++/5/condition_variable:91:5: note:   no known conversion for argument 1 from 'std::lock_guard<std::mutex>' to 'std::unique_lock<std::mutex>&'
/usr/include/c++/5/condition_variable:95:7: note: candidate: template<class _Predicate> void std::condition_variable::wait(std::unique_lock<std::mutex>&, _Predicate)
       wait(unique_lock<mutex>& __lock, _Predicate __p)
       ^
/usr/include/c++/5/condition_variable:95:7: note:   template argument deduction/substitution failed:
In file included from /__w/1/s/outofcore/include/pcl/outofcore/outofcore_impl.h:44:0,
                 from /__w/1/s/examples/outofcore/example_outofcore_with_lod.cpp:43:
/__w/1/s/outofcore/include/pcl/outofcore/impl/monitor_queue.hpp:29:33: note:   cannot convert 'lock' (type 'std::lock_guard<std::mutex>') to type 'std::unique_lock<std::mutex>&'
       item_available_.wait (lock);
                                 ^
In file included from /__w/1/s/outofcore/include/pcl/outofcore/outofcore_impl.h:47:0,
                 from /__w/1/s/examples/outofcore/example_outofcore_with_lod.cpp:43:
/__w/1/s/outofcore/include/pcl/outofcore/impl/octree_base_node.hpp: At global scope:
/__w/1/s/outofcore/include/pcl/outofcore/impl/octree_base_node.hpp:78:61: error: 'std::mutex pcl::outofcore::OutofcoreOctreeBaseNode<ContainerT, PointT>::rng_mutex_' is not a static data member of 'class pcl::outofcore::OutofcoreOctreeBaseNode<ContainerT, PointT>'
     std::mutex OutofcoreOctreeBaseNode<ContainerT, PointT>::rng_mutex_;
                                                             ^
/__w/1/s/outofcore/include/pcl/outofcore/impl/octree_base_node.hpp:78:61: error: template definition of non-template 'std::mutex pcl::outofcore::OutofcoreOctreeBaseNode<ContainerT, PointT>::rng_mutex_'
In file included from /__w/1/s/outofcore/include/pcl/outofcore/outofcore_impl.h:47:0,
                 from /__w/1/s/examples/outofcore/example_outofcore_with_lod.cpp:43:
/__w/1/s/outofcore/include/pcl/outofcore/impl/octree_base_node.hpp: In member function 'void pcl::outofcore::OutofcoreOctreeBaseNode<ContainerT, PointT>::randomSample(const AlignedPointTVector&, pcl::outofcore::OutofcoreOctreeBaseNode<ContainerT, PointT>::AlignedPointTVector&, bool)':
/__w/1/s/outofcore/include/pcl/outofcore/impl/octree_base_node.hpp:597:42: error: 'rng_mutex_' was not declared in this scope
         std::lock_guard<std::mutex> lock(rng_mutex_);
                                          ^
/__w/1/s/outofcore/include/pcl/outofcore/impl/octree_base_node.hpp:610:42: error: 'rng_mutex_' was not declared in this scope
         std::lock_guard<std::mutex> lock(rng_mutex_);
                                          ^
In file included from /__w/1/s/outofcore/include/pcl/outofcore/outofcore_impl.h:49:0,
                 from /__w/1/s/examples/outofcore/example_outofcore_with_lod.cpp:43:
/__w/1/s/outofcore/include/pcl/outofcore/impl/octree_disk_container.hpp: At global scope:
/__w/1/s/outofcore/include/pcl/outofcore/impl/octree_disk_container.hpp:74:54: error: 'std::mutex pcl::outofcore::OutofcoreOctreeDiskContainer<PointT>::rng_mutex_' is not a static data member of 'class pcl::outofcore::OutofcoreOctreeDiskContainer<PointT>'
     std::mutex OutofcoreOctreeDiskContainer<PointT>::rng_mutex_;
                                                      ^
/__w/1/s/outofcore/include/pcl/outofcore/impl/octree_disk_container.hpp:74:54: error: template definition of non-template 'std::mutex pcl::outofcore::OutofcoreOctreeDiskContainer<PointT>::rng_mutex_'
/__w/1/s/outofcore/include/pcl/outofcore/impl/octree_disk_container.hpp: In static member function 'static void pcl::outofcore::OutofcoreOctreeDiskContainer<PointT>::getRandomUUIDString(std::__cxx11::string&)':
/__w/1/s/outofcore/include/pcl/outofcore/impl/octree_disk_container.hpp:92:43: error: 'rng_mutex_' was not declared in this scope
         std::lock_guard<std::mutex> lock (rng_mutex_);
                                           ^
In file included from /__w/1/s/outofcore/include/pcl/outofcore/outofcore_impl.h:49:0,
                 from /__w/1/s/examples/outofcore/example_outofcore_with_lod.cpp:43:
/__w/1/s/outofcore/include/pcl/outofcore/impl/octree_disk_container.hpp: In member function 'void pcl::outofcore::OutofcoreOctreeDiskContainer<PointT>::readRangeSubSample_bernoulli(uint64_t, uint64_t, double, pcl::outofcore::OutofcoreOctreeDiskContainer<PointT>::AlignedPointTVector&)':
/__w/1/s/outofcore/include/pcl/outofcore/impl/octree_disk_container.hpp:300:45: error: 'rng_mutex_' was not declared in this scope
           std::lock_guard<std::mutex> lock (rng_mutex_);
                                             ^
/__w/1/s/outofcore/include/pcl/outofcore/impl/octree_disk_container.hpp:319:45: error: 'rng_mutex_' was not declared in this scope
           std::lock_guard<std::mutex> lock (rng_mutex_);
                                             ^
/__w/1/s/outofcore/include/pcl/outofcore/impl/octree_disk_container.hpp: In member function 'void pcl::outofcore::OutofcoreOctreeDiskContainer<PointT>::readRangeSubSample(uint64_t, uint64_t, double, pcl::outofcore::OutofcoreOctreeDiskContainer<PointT>::AlignedPointTVector&)':
/__w/1/s/outofcore/include/pcl/outofcore/impl/octree_disk_container.hpp:401:45: error: 'rng_mutex_' was not declared in this scope
           std::lock_guard<std::mutex> lock (rng_mutex_);
                                             ^
/__w/1/s/outofcore/include/pcl/outofcore/impl/octree_disk_container.hpp:419:45: error: 'rng_mutex_' was not declared in this scope
           std::lock_guard<std::mutex> lock (rng_mutex_);
                                             ^
In file included from /__w/1/s/outofcore/include/pcl/outofcore/outofcore_impl.h:50:0,
                 from /__w/1/s/examples/outofcore/example_outofcore_with_lod.cpp:43:
/__w/1/s/outofcore/include/pcl/outofcore/impl/octree_ram_container.hpp: At global scope:
/__w/1/s/outofcore/include/pcl/outofcore/impl/octree_ram_container.hpp:54:53: error: 'std::mutex pcl::outofcore::OutofcoreOctreeRamContainer<PointT>::rng_mutex_' is not a static data member of 'class pcl::outofcore::OutofcoreOctreeRamContainer<PointT>'
     std::mutex OutofcoreOctreeRamContainer<PointT>::rng_mutex_;
                                                     ^
/__w/1/s/outofcore/include/pcl/outofcore/impl/octree_ram_container.hpp:54:53: error: template definition of non-template 'std::mutex pcl::outofcore::OutofcoreOctreeRamContainer<PointT>::rng_mutex_'
/__w/1/s/outofcore/include/pcl/outofcore/impl/octree_ram_container.hpp: In member function 'void pcl::outofcore::OutofcoreOctreeRamContainer<PointT>::readRangeSubSample(uint64_t, uint64_t, double, pcl::outofcore::OutofcoreOctreeRamContainer<PointT>::AlignedPointTVector&)':
/__w/1/s/outofcore/include/pcl/outofcore/impl/octree_ram_container.hpp:125:41: error: 'rng_mutex_' was not declared in this scope
       std::lock_guard<std::mutex> lock (rng_mutex_);
                                         ^

@SergioRAgostinho
Copy link
Member Author

Good for review now.

@taketwo taketwo merged commit db7eb3c into PointCloudLibrary:master May 9, 2019
@SergioRAgostinho SergioRAgostinho deleted the cv-outofcore-rebase branch May 9, 2019 08:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog: ABI break Meta-information for changelog generation module: outofcore
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants