From 5446ee23b9000f30f082df9e280a96772dfce1d1 Mon Sep 17 00:00:00 2001 From: Neeflix Date: Thu, 7 Jun 2018 20:23:12 +0200 Subject: [PATCH] added order :wheelchair: --- FlippR-Driver/.gitignore | 1 + FlippR-Driver/{ => etc}/Input_Config.json | 0 FlippR-Driver/{ => etc}/Input_Matrix_Config.json | 0 FlippR-Driver/src/utilities/BlockingQueue.hpp | 2 +- 4 files changed, 2 insertions(+), 1 deletion(-) rename FlippR-Driver/{ => etc}/Input_Config.json (100%) rename FlippR-Driver/{ => etc}/Input_Matrix_Config.json (100%) diff --git a/FlippR-Driver/.gitignore b/FlippR-Driver/.gitignore index 92708ce..efc2322 100644 --- a/FlippR-Driver/.gitignore +++ b/FlippR-Driver/.gitignore @@ -1,2 +1,3 @@ build src/Debug +/Debug/ diff --git a/FlippR-Driver/Input_Config.json b/FlippR-Driver/etc/Input_Config.json similarity index 100% rename from FlippR-Driver/Input_Config.json rename to FlippR-Driver/etc/Input_Config.json diff --git a/FlippR-Driver/Input_Matrix_Config.json b/FlippR-Driver/etc/Input_Matrix_Config.json similarity index 100% rename from FlippR-Driver/Input_Matrix_Config.json rename to FlippR-Driver/etc/Input_Matrix_Config.json diff --git a/FlippR-Driver/src/utilities/BlockingQueue.hpp b/FlippR-Driver/src/utilities/BlockingQueue.hpp index 350f6ad..81e2f9f 100644 --- a/FlippR-Driver/src/utilities/BlockingQueue.hpp +++ b/FlippR-Driver/src/utilities/BlockingQueue.hpp @@ -20,7 +20,7 @@ class BlockingQueue private: std::mutex d_mutex; std::condition_variable d_condition; - heap::priority_queue> p_queue; + heap::priority_queue> p_queue; public: void push(T const& value)