Added missing includes - <memory> and <functional> for g++ 8.3.0 (not…

… tested yet)
bexcite · Jun 13, 2019 · 3228754 · 3228754
1 parent bd55107
commit 3228754
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 .DS_store
 build/
+.vscode/ipch
diff --git a/include/cv_gl/gl_window.h b/include/cv_gl/gl_window.h
@@ -4,6 +4,8 @@
 
 #include <string>
 #include <vector>
+#include <functional>
+
 #include "cv_gl/camera.h"
 
 #include <glad/glad.h>

diff --git a/include/cv_gl/shader.h b/include/cv_gl/shader.h
@@ -6,6 +6,7 @@
 
 #include <iostream>
 #include <string>
+#include <memory>
 
 class Shader {
   // Shader();

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -22,7 +22,6 @@ target_link_libraries(cv_gl_lib PUBLIC
 set_target_properties(cv_gl_lib PROPERTIES
     RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
-
 #[[
 ]]
 set(CV_GL_NAME cv_gl)
@@ -87,7 +86,7 @@ target_include_directories(${TS_NAME} PUBLIC ${PROJECT_INCLUDE_DIRS} )
 target_link_libraries(${TS_NAME} PUBLIC cv_gl_lib cereal )
 set_target_properties(${TS_NAME} PROPERTIES
     RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-    
+
 
 
 

diff --git a/src/shader.cpp b/src/shader.cpp
@@ -1,12 +1,13 @@
 // Copyright Pavlo 2017
 
-#include <glad/glad.h>
+#include "cv_gl/shader.h"
 
 #include <iostream>
 #include <fstream>
 #include <sstream>
 
-#include "cv_gl/shader.h"
+#include <glad/glad.h>
+
 
 int Shader::count_ = 0;