From 4d559bbaeeb59063515fc7c4c8ab60528d1acbfc Mon Sep 17 00:00:00 2001
From: Simon Walton <simon@highfidelity.io>
Date: Fri, 27 Jul 2018 10:05:34 -0700
Subject: [PATCH] Don't initialize an atomic; squelch gcc warning

---
 libraries/octree/src/OctreeProcessor.h | 2 +-
 libraries/octree/src/OctreeQuery.cpp   | 2 +-
 libraries/octree/src/OctreeQuery.h     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/octree/src/OctreeProcessor.h b/libraries/octree/src/OctreeProcessor.h
index 8085682fa5..1bc3bd10f9 100644
--- a/libraries/octree/src/OctreeProcessor.h
+++ b/libraries/octree/src/OctreeProcessor.h
@@ -79,7 +79,7 @@ protected:
     int _packetsInLastWindow = 0;
     int _elementsInLastWindow = 0;
     int _entitiesInLastWindow = 0;
-    std::atomic<OCTREE_PACKET_SEQUENCE> _lastOctreeMessageSequence = 0;
+    std::atomic<OCTREE_PACKET_SEQUENCE> _lastOctreeMessageSequence;
 
 };
 
diff --git a/libraries/octree/src/OctreeQuery.cpp b/libraries/octree/src/OctreeQuery.cpp
index 77977bf01e..8c3685dc69 100644
--- a/libraries/octree/src/OctreeQuery.cpp
+++ b/libraries/octree/src/OctreeQuery.cpp
@@ -27,7 +27,7 @@ OctreeQuery::OctreeQuery(bool randomizeConnectionID) {
     }
 }
 
-const OctreeQuery::OctreeQueryFlags operator|=(OctreeQuery::OctreeQueryFlags& lhs, int rhs) {
+OctreeQuery::OctreeQueryFlags operator|=(OctreeQuery::OctreeQueryFlags& lhs, int rhs) {
     return lhs = OctreeQuery::OctreeQueryFlags(lhs | rhs);
 }
 
diff --git a/libraries/octree/src/OctreeQuery.h b/libraries/octree/src/OctreeQuery.h
index 04d6793158..2c3c00ef05 100644
--- a/libraries/octree/src/OctreeQuery.h
+++ b/libraries/octree/src/OctreeQuery.h
@@ -79,7 +79,7 @@ protected:
     QReadWriteLock _jsonParametersLock;
     
     enum OctreeQueryFlags : uint16_t { NoFlags = 0x0, WantInitialCompletion = 0x1 };
-    friend const OctreeQuery::OctreeQueryFlags operator|=(OctreeQuery::OctreeQueryFlags& lhs, const int rhs);
+    friend OctreeQuery::OctreeQueryFlags operator|=(OctreeQuery::OctreeQueryFlags& lhs, const int rhs);
 
     bool _hasReceivedFirstQuery { false };
     bool _reportInitialCompletion { false };