From 7fa30523084841fa7244e42acaa88eb708f6a263 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 8 Jul 2013 17:48:46 -0700 Subject: [PATCH] remove double glm includes --- libraries/audio/src/AudioInjector.h | 1 - libraries/shared/src/Operative.cpp | 5 ++--- libraries/shared/src/Operative.h | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/libraries/audio/src/AudioInjector.h b/libraries/audio/src/AudioInjector.h index 29ff920317..822df026aa 100644 --- a/libraries/audio/src/AudioInjector.h +++ b/libraries/audio/src/AudioInjector.h @@ -9,7 +9,6 @@ #ifndef __hifi__AudioInjector__ #define __hifi__AudioInjector__ -#include #include #include diff --git a/libraries/shared/src/Operative.cpp b/libraries/shared/src/Operative.cpp index 1ec74c7e86..0212ca2792 100644 --- a/libraries/shared/src/Operative.cpp +++ b/libraries/shared/src/Operative.cpp @@ -6,16 +6,15 @@ // Copyright (c) 2013 HighFidelity, Inc. All rights reserved. // -#include #include #include "NodeList.h" - #include "NodeTypes.h" -#include "Operative.h" #include "PacketHeaders.h" #include "SharedUtil.h" +#include "Operative.h" + const float BUG_VOXEL_SIZE = 0.0625f / 128; glm::vec3 bugPosition = glm::vec3(BUG_VOXEL_SIZE * 20.0, BUG_VOXEL_SIZE * 30.0, BUG_VOXEL_SIZE * 20.0); glm::vec3 bugDirection = glm::vec3(0, 0, 1); diff --git a/libraries/shared/src/Operative.h b/libraries/shared/src/Operative.h index a77cc5d62b..a9dbf8bf94 100644 --- a/libraries/shared/src/Operative.h +++ b/libraries/shared/src/Operative.h @@ -9,8 +9,6 @@ #ifndef __hifi__Operative__ #define __hifi__Operative__ -#include - class Operative { public: void run();