From bc251de43c241fa4555f172aa9c73d36f5bbc761 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Tue, 14 Jul 2015 16:49:22 -0700
Subject: [PATCH] delete dead code

---
 libraries/networking/src/NetworkPacket.cpp | 13 -------------
 libraries/networking/src/NetworkPacket.h   |  6 ------
 libraries/octree/src/JurisdictionMap.cpp   | 17 -----------------
 libraries/octree/src/JurisdictionMap.h     |  6 ------
 4 files changed, 42 deletions(-)

diff --git a/libraries/networking/src/NetworkPacket.cpp b/libraries/networking/src/NetworkPacket.cpp
index 69bd0962bf..e99ef1ab8b 100644
--- a/libraries/networking/src/NetworkPacket.cpp
+++ b/libraries/networking/src/NetworkPacket.cpp
@@ -40,16 +40,3 @@ NetworkPacket& NetworkPacket::operator=(NetworkPacket const& other) {
     copyContents(other.getNode(), other.getByteArray());
     return *this;
 }
-
-#ifdef HAS_MOVE_SEMANTICS
-// move, same as copy, but other packet won't be used further
-NetworkPacket::NetworkPacket(NetworkPacket && packet) {
-    copyContents(packet.getNode(), packet.getByteArray());
-}
-
-// move assignment
-NetworkPacket& NetworkPacket::operator=(NetworkPacket&& other) {
-    copyContents(other.getNode(), other.getByteArray());
-    return *this;
-}
-#endif
diff --git a/libraries/networking/src/NetworkPacket.h b/libraries/networking/src/NetworkPacket.h
index caee42f126..a7e5a6b3cd 100644
--- a/libraries/networking/src/NetworkPacket.h
+++ b/libraries/networking/src/NetworkPacket.h
@@ -22,12 +22,6 @@ public:
     NetworkPacket() { }
     NetworkPacket(const NetworkPacket& packet); // copy constructor
     NetworkPacket& operator= (const NetworkPacket& other);    // copy assignment
-
-#ifdef HAS_MOVE_SEMANTICS
-    NetworkPacket(NetworkPacket&& packet); // move?? // same as copy, but other packet won't be used further
-    NetworkPacket& operator= (NetworkPacket&& other);         // move assignment
-#endif
-
     NetworkPacket(const SharedNodePointer& node, const QByteArray& byteArray);
 
     const SharedNodePointer& getNode() const { return _node; }
diff --git a/libraries/octree/src/JurisdictionMap.cpp b/libraries/octree/src/JurisdictionMap.cpp
index 46e758cb42..f1a0fd2a38 100644
--- a/libraries/octree/src/JurisdictionMap.cpp
+++ b/libraries/octree/src/JurisdictionMap.cpp
@@ -30,23 +30,6 @@ JurisdictionMap& JurisdictionMap::operator=(const JurisdictionMap& other) {
     return *this;
 }
 
-#ifdef HAS_MOVE_SEMANTICS
-// Move constructor
-JurisdictionMap::JurisdictionMap(JurisdictionMap&& other) : _rootOctalCode(NULL) {
-    init(other._rootOctalCode, other._endNodes);
-    other._rootOctalCode = NULL;
-    other._endNodes.clear();
-}
-
-// move assignment
-JurisdictionMap& JurisdictionMap::operator=(JurisdictionMap&& other) {
-    init(other._rootOctalCode, other._endNodes);
-    other._rootOctalCode = NULL;
-    other._endNodes.clear();
-    return *this;
-}
-#endif
-
 // Copy constructor
 JurisdictionMap::JurisdictionMap(const JurisdictionMap& other) : _rootOctalCode(NULL) {
     copyContents(other);
diff --git a/libraries/octree/src/JurisdictionMap.h b/libraries/octree/src/JurisdictionMap.h
index ba75e3102b..ed4ceb79c0 100644
--- a/libraries/octree/src/JurisdictionMap.h
+++ b/libraries/octree/src/JurisdictionMap.h
@@ -37,12 +37,6 @@ public:
     // standard assignment
     JurisdictionMap& operator=(const JurisdictionMap& other);    // copy assignment
 
-#ifdef HAS_MOVE_SEMANTICS
-    // move constructor and assignment
-    JurisdictionMap(JurisdictionMap&& other); // move constructor
-    JurisdictionMap& operator= (JurisdictionMap&& other);         // move assignment
-#endif
-    
     // application constructors    
     JurisdictionMap(const char* filename);
     JurisdictionMap(unsigned char* rootOctalCode, const std::vector<unsigned char*>& endNodes);