Removed the rest of the compiler warnings

master
mitchellhansen 7 years ago
parent fb6557fba2
commit da461a0ee4

@ -1,4 +1,8 @@
#pragma once #pragma once
// As if hardware is ever going to move away from 1.2
#define CL_USE_DEPRECATED_OPENCL_1_2_APIS
#ifdef linux #ifdef linux
#include <CL/cl.h> #include <CL/cl.h>
#include <CL/opencl.h> #include <CL/opencl.h>
@ -7,9 +11,6 @@
// Good lord, windows.h overwrote the std::min() max() definitions // Good lord, windows.h overwrote the std::min() max() definitions
#define NOMINMAX #define NOMINMAX
#include <windows.h> #include <windows.h>
// As if hardware is ever going to move away from 1.2
#define CL_USE_DEPRECATED_OPENCL_1_2_APIS
#include <CL/cl.h> #include <CL/cl.h>
#include <CL/opencl.h> #include <CL/opencl.h>
@ -20,17 +21,15 @@
#include <OpenCL/cl_gl_ext.h> #include <OpenCL/cl_gl_ext.h>
#include <OpenCL/cl_ext.h> #include <OpenCL/cl_ext.h>
#endif #endif
#pragma once
#include "util.hpp" #include <chrono>
#include <SFML/Graphics.hpp> #include <SFML/Graphics.hpp>
//#include "CLCaster.h"
#include "Camera.h" #include "Camera.h"
#include "Input.h" #include "Input.h"
#include "LightController.h" #include "LightController.h"
#include "LightHandle.h" #include "LightHandle.h"
#include "map/Map.h" #include "map/Map.h"
#include <chrono> #include "util.hpp"
#include "imgui/imgui-SFML.h"
// Srsly people who macro error codes are the devil // Srsly people who macro error codes are the devil
#undef ERROR #undef ERROR

@ -1,19 +1,17 @@
#pragma once #pragma once
#define CL_USE_DEPRECATED_OPENCL_1_2_APIS #include <GL/glew.h>
#include <Vector4.hpp>
#include <vector>
#include <iostream> #include <iostream>
#include <map> #include <map>
#include <GL/glew.h>
#include <string.h> #include <string.h>
#include "LightController.h"
#include "Camera.h"
//#include <GL/glew.h>
#include <Application.h>
#include <unordered_map> #include <unordered_map>
#include <vector>
#include "Application.h"
#include "Camera.h"
#include "Gui.h"
#include "LightController.h"
#include "Logger.h" #include "Logger.h"
#include "map/Map.h" #include "map/Map.h"
#include "Gui.h" #include "Vector4.hpp"
#ifdef linux #ifdef linux
#include <CL/cl.h> #include <CL/cl.h>

@ -1,10 +1,10 @@
#pragma once #pragma once
#include <cmath>
#include <SFML/System/Vector3.hpp> #include <SFML/System/Vector3.hpp>
#include <SFML/System/Vector2.hpp> #include <SFML/System/Vector2.hpp>
#include "util.hpp"
#include "Pub_Sub.h"
#include <cmath>
#include "Gui.h" #include "Gui.h"
#include "Pub_Sub.h"
#include "util.hpp"

@ -1,6 +1,7 @@
#pragma once #pragma once
#include <string>
#include <experimental/filesystem> #include <experimental/filesystem>
#include <iostream>
#include <string>
class ConfigDB { class ConfigDB {

@ -1,4 +1,5 @@
#pragma once #pragma once
#include <chrono>
#include "Pub_Sub.h" #include "Pub_Sub.h"
class FrameWatcher : public VrEventPublisher{ class FrameWatcher : public VrEventPublisher{

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <list> #include <list>
#include <mutex> #include <mutex>
#include <Logger.h> #include "Logger.h"
/** /**
* *

@ -5,11 +5,11 @@
#include <string> #include <string>
#include <SFML/Graphics.hpp> #include <SFML/Graphics.hpp>
#include "Event.hpp" #include "Event.hpp"
#include "Pub_Sub.h"
#include "Gui.h" #include "Gui.h"
#include "Logger.h"
#include "LightHandle.h" #include "LightHandle.h"
#include "Logger.h"
#include "Pub_Sub.h"
#include <imgui/imgui-SFML.h>
/** /**
* *
* Input * Input

@ -1,4 +1,5 @@
#pragma once #pragma once
#include <cstring>
#include <list> #include <list>
#include <thread> #include <thread>
#include <SFML/Network.hpp> #include <SFML/Network.hpp>

@ -2,6 +2,7 @@
#include <iostream> #include <iostream>
#include <memory> #include <memory>
#include <set> #include <set>
#include <vector>
#include <SFML/Graphics.hpp> #include <SFML/Graphics.hpp>
#include "Event.hpp" #include "Event.hpp"

@ -5,9 +5,10 @@
#include <time.h> #include <time.h>
#include <SFML/System/Clock.hpp> #include <SFML/System/Clock.hpp>
#include <SFML/System/Vector3.hpp> #include <SFML/System/Vector3.hpp>
#include "util.hpp" #include "Logger.h"
#include "map/ArrayMap.h" #include "map/ArrayMap.h"
#include "map/Octree.h" #include "map/Octree.h"
#include "util.hpp"
#define _USE_MATH_DEFINES #define _USE_MATH_DEFINES
#include <math.h> #include <math.h>

@ -1,5 +1,4 @@
#include "Camera.h" #include "Camera.h"
#include "Pub_Sub.h"
Camera::Camera() {} Camera::Camera() {}

@ -1,5 +1,5 @@
#include "ConfigDB.h" #include "ConfigDB.h"
#include <iostream>
ConfigDB::ConfigDB() ConfigDB::ConfigDB()
{ {

@ -1,5 +1,5 @@
#include "FrameWatcher.h" #include "FrameWatcher.h"
#include <chrono>
FrameWatcher::FrameWatcher() { FrameWatcher::FrameWatcher() {

@ -1,6 +1,4 @@
#pragma once #include "Input.h"
#include <imgui/imgui-SFML.h>
#include "Input.h"
Input::Input() { Input::Input() {

@ -1,7 +1,4 @@
#include "NetworkInput.h" #include "NetworkInput.h"
#include <iostream>
#include <cstring>
#include <memory>
NetworkInput::NetworkInput() { NetworkInput::NetworkInput() {

@ -1,5 +1,3 @@
#include <vector>
#include "Event.hpp"
#include "Pub_Sub.h" #include "Pub_Sub.h"

@ -1,8 +1,4 @@
#include <SFML/Graphics.hpp>
#include <iostream>
#include "map/Map.h"
#include <Ray.h> #include <Ray.h>
#include "util.hpp"
Ray::Ray( Ray::Ray(
Map *map, Map *map,

@ -1,5 +1,5 @@
#include "map/Map.h" #include "map/Map.h"
#include "Logger.h"
Map::Map(uint32_t dimensions) : array_map(sf::Vector3i(dimensions, dimensions, dimensions)) { Map::Map(uint32_t dimensions) : array_map(sf::Vector3i(dimensions, dimensions, dimensions)) {

Loading…
Cancel
Save