mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 19:25:27 +08:00
e7abe49e60
- [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [x] The "supports" clause reflects platforms that may be fixed by this new version. - [x] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file. - [x] Any patches that are no longer applied are deleted from the port's directory. - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file. Removed [fix_autouic.patch](https://github.com/microsoft/vcpkg/pull/36886/files#diff-87383504f8ec473089a965ec245ef25524ce3f95a3da21a17585ae3788cbae6b) as fixed upstream.
16 lines
574 B
Diff
16 lines
574 B
Diff
diff --git a/corelib/src/global_map/OctoMap.cpp b/corelib/src/global_map/OctoMap.cpp
|
|
index d4c22499..87acefcd 100644
|
|
--- a/corelib/src/global_map/OctoMap.cpp
|
|
+++ b/corelib/src/global_map/OctoMap.cpp
|
|
@@ -278,10 +278,8 @@ RtabmapColorOcTree::StaticMemberInitializer::StaticMemberInitializer() {
|
|
AbstractOcTree::registerTreeType(tree);
|
|
}
|
|
|
|
-#ifndef _WIN32
|
|
// On Windows, the app freezes on start if the following is defined
|
|
RtabmapColorOcTree::StaticMemberInitializer RtabmapColorOcTree::RtabmapColorOcTreeMemberInit;
|
|
-#endif
|
|
|
|
|
|
//////////////////////////////////////
|