diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-07-08 14:53:17 -0700 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-07-08 14:53:17 -0700 |
| commit | df65ecaa343dc977857693b1719f3fe54a47e6d4 (patch) | |
| tree | 294ca90692e685ba92474dfb5d6b38bd815d875b | |
| parent | ec958d68be1cfe06cc45f3bdbb7c43ab473f3617 (diff) | |
| download | qtlocation-mapboxgl-df65ecaa343dc977857693b1719f3fe54a47e6d4.tar.gz | |
fix compile errors
| -rw-r--r-- | common/headless_view.hpp | 4 | ||||
| -rw-r--r-- | src/util/io.cpp | 1 | ||||
| -rw-r--r-- | test/headless.cpp | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/common/headless_view.hpp b/common/headless_view.hpp index a203d477e0..b3e1c11b9b 100644 --- a/common/headless_view.hpp +++ b/common/headless_view.hpp @@ -29,14 +29,14 @@ private: private: -#ifdef LLMR_USE_CGL +#if LLMR_USE_CGL CGLContextObj gl_context; GLuint fbo = 0; GLuint fbo_depth_stencil = 0; GLuint fbo_color = 0; #endif -#ifdef LLMR_USE_GLX +#if LLMR_USE_GLX GLXContext gl_context = nullptr; XVisualInfo *x_info = nullptr; Display *x_display = nullptr; diff --git a/src/util/io.cpp b/src/util/io.cpp index fb36998e07..1312b907ba 100644 --- a/src/util/io.cpp +++ b/src/util/io.cpp @@ -4,6 +4,7 @@ #include <iostream> #include <sstream> #include <fstream> +#include <stdexcept> namespace llmr { namespace util { diff --git a/test/headless.cpp b/test/headless.cpp index 108d7627be..2428b1a2f8 100644 --- a/test/headless.cpp +++ b/test/headless.cpp @@ -5,9 +5,10 @@ #include <llmr/util/io.hpp> #include <llmr/util/std.hpp> -#include "../common/headless_view.hpp" #include <rapidjson/document.h> +#include "../common/headless_view.hpp" + const std::string base_directory = []{ std::string fn = __FILE__; fn.erase(fn.find_last_of("/")); |