Skip to content
Snippets Groups Projects
Commit 5fe91dc5 authored by Nicolas Pope's avatar Nicolas Pope
Browse files

Minor corrections and Werror

parent cf6224b0
No related branches found
No related tags found
No related merge requests found
Pipeline #22720 failed
...@@ -328,7 +328,7 @@ if (WIN32) # TODO(nick) Should do based upon compiler (VS) ...@@ -328,7 +328,7 @@ if (WIN32) # TODO(nick) Should do based upon compiler (VS)
set(OS_LIBS "") set(OS_LIBS "")
else() else()
add_definitions(-DUNIX) add_definitions(-DUNIX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -msse3 -Werror=return-type") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -msse3 -Werror")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -pg -Wall") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -pg -Wall")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -Wall -mfpmath=sse") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -Wall -mfpmath=sse")
set(OS_LIBS "dl") set(OS_LIBS "dl")
......
...@@ -4,6 +4,6 @@ ...@@ -4,6 +4,6 @@
static int frameset_counter = 0; static int frameset_counter = 0;
int ftl::gui::mapToFrameset(const std::string &uri) { int ftl::gui::mapToFrameset(const std::string &uri) {
ftl::URI u(uri); //ftl::URI u(uri);
return frameset_counter++; return frameset_counter++;
} }
...@@ -40,17 +40,17 @@ struct __align__(16) Camera { ...@@ -40,17 +40,17 @@ struct __align__(16) Camera {
/** /**
* Convert screen plus depth into camera coordinates. * Convert screen plus depth into camera coordinates.
*/ */
__device__ float3 screenToCam(int ux, int uy, float depth) const; __host__ __device__ float3 screenToCam(int ux, int uy, float depth) const;
/** /**
* Convert screen plus depth into camera coordinates. * Convert screen plus depth into camera coordinates.
*/ */
__device__ float3 screenToCam(uint ux, uint uy, float depth) const; __host__ __device__ float3 screenToCam(uint ux, uint uy, float depth) const;
/** /**
* Convert screen plus depth into camera coordinates. * Convert screen plus depth into camera coordinates.
*/ */
__device__ float3 screenToCam(float ux, float uy, float depth) const; __host__ __device__ float3 screenToCam(float ux, float uy, float depth) const;
#ifndef __CUDACC__ #ifndef __CUDACC__
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment