p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compilation on Windows

This commit is contained in:
nsubiron 2018-10-14 20:38:23 +02:00
parent 5bb425737c
commit e19a5cb7b9
4 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LibCarla/source/carla/sensor/CompileTimeTypeMap.h
View File

@ -94,10 +94,10 @@ namespace detail {
}
template <typename InKey>
using get = typename detail::CompileTimeTypeMapImpl<size(), Items...>::template get<InKey>;
using get = typename detail::CompileTimeTypeMapImpl<sizeof...(Items), Items...>::template get<InKey>;
template <size_t Index>
using get_by_index = typename detail::CompileTimeTypeMapImpl<size(), Items...>::template get_by_index<Index>;
using get_by_index = typename detail::CompileTimeTypeMapImpl<sizeof...(Items), Items...>::template get_by_index<Index>;
};
} // namespace sensor

24
LibCarla/source/compiler/disable-ue4-macros.h
View File

@ -25,6 +25,18 @@
# endif // __cpp_noexcept_function_type
#endif // defined(__clang__)
namespace boost {
static inline void throw_exception(const std::exception &e) {
UE_LOG(LogCarla, Fatal, TEXT("Exception thrown on Boost libraries: %s"), UTF8_TO_TCHAR(e.what()));
}
} // namespace boost
#endif // LIBCARLA_INCLUDED_DISABLE_UE4_MACROS_HEADER
#define LIBCARLA_INCLUDED_FROM_UE4
// NOTE(Andrei): disable warning generated by undefined macros
// __GNUC__, __GNUC_MINOR__
// MSGPACK_ARCH_AMD64
@ -41,18 +53,6 @@
# pragma warning(disable: 4668 4191)
#endif
namespace boost {
static inline void throw_exception(const std::exception &e) {
UE_LOG(LogCarla, Fatal, TEXT("Exception thrown on Boost libraries: %s"), UTF8_TO_TCHAR(e.what()));
}
} // namespace boost
#endif // LIBCARLA_INCLUDED_DISABLE_UE4_MACROS_HEADER
#define LIBCARLA_INCLUDED_FROM_UE4
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wmissing-braces"

2
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/TaggerDelegate.h
View File

@ -6,6 +6,8 @@
#pragma once
#include "Engine/World.h"
#include "TaggerDelegate.generated.h"
/// Used to tag every actor that is spawned into the world.

2
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/PixelReader.cpp
View File

@ -123,7 +123,7 @@ void FPixelReader::WritePixelsToBuffer(
#if CARLA_WITH_VULKAN_SUPPORT == 1
if (IsVulkanPlatform(GMaxRHIShaderPlatform))
{
WritePixelsToBuffer_Vulkan(RenderTarget, Buffer, InRHICmdList);
WritePixelsToBuffer_Vulkan(RenderTarget, Buffer, Offset, InRHICmdList);
return;
}
#endif // CARLA_WITH_VULKAN_SUPPORT