build issues fixed after merge

libraries/entities/src/EntityEditPacketSender.cpp

@@ -18,7 +18,7 @@
 
 
 void EntityEditPacketSender::adjustEditPacketForClockSkew(PacketType type, 
-                                        unsigned char* editBuffer, ssize_t length, int clockSkew) {
+                                        unsigned char* editBuffer, size_t length, int clockSkew) {
                                         
     if (type == PacketTypeEntityAddOrEdit) {
         EntityItem::adjustEditPacketForClockSkew(editBuffer, length, clockSkew);

libraries/entities/src/EntityEditPacketSender.h

@@ -30,6 +30,6 @@ public:
 
     // My server type is the model server
     virtual char getMyNodeType() const { return NodeType::EntityServer; }
-    virtual void adjustEditPacketForClockSkew(PacketType type, unsigned char* editBuffer, ssize_t length, int clockSkew);
+    virtual void adjustEditPacketForClockSkew(PacketType type, unsigned char* editBuffer, size_t length, int clockSkew);
 };
 #endif // hifi_EntityEditPacketSender_h

libraries/entities/src/EntityItem.cpp

@@ -12,6 +12,7 @@
 #include <QtCore/QObject>
 
 #include <ByteCountCoding.h>
+#include <GLMHelpers.h>
 #include <Octree.h>
 #include <RegisteredMetaTypes.h>
 #include <SharedUtil.h> // usecTimestampNow()
@@ -23,7 +24,7 @@
 // I'm open to other potential solutions. Could we change cmake to allow libraries to reference each others
 // headers, but not link to each other, this is essentially what this construct is doing, but would be
 // better to add includes to the include path, but not link
-#include "../../script-engine/src/ScriptEngine.h"
+//#include "../../script-engine/src/ScriptEngine.h"
 
 #include "EntityScriptingInterface.h"
 #include "EntityItem.h"
@@ -649,7 +650,7 @@ void EntityItem::debugDump() const {
 }
 
 // adjust any internal timestamps to fix clock skew for this server
-void EntityItem::adjustEditPacketForClockSkew(unsigned char* editPacketBuffer, ssize_t length, int clockSkew) {
+void EntityItem::adjustEditPacketForClockSkew(unsigned char* editPacketBuffer, size_t length, int clockSkew) {
     unsigned char* dataAt = editPacketBuffer;
     int octets = numberOfThreeBitSectionsInCode(dataAt);
     int lengthOfOctcode = bytesRequiredForCodeLength(octets);

libraries/entities/src/EntityItem.h

@@ -85,7 +85,7 @@ public:
     static bool encodeEntityEditMessageDetails(PacketType command, EntityItemID id, const EntityItemProperties& details,
                         unsigned char* bufferOut, int sizeIn, int& sizeOut);
 
-    static void adjustEditPacketForClockSkew(unsigned char* codeColorBuffer, ssize_t length, int clockSkew);
+    static void adjustEditPacketForClockSkew(unsigned char* codeColorBuffer, size_t length, int clockSkew);
     virtual void update(const quint64& now);
     
     typedef enum SimuationState_t {

libraries/entities/src/EntityItemProperties.cpp

@@ -13,6 +13,7 @@
 #include <QObject>
 
 #include <ByteCountCoding.h>
+#include <GLMHelpers.h>
 #include <RegisteredMetaTypes.h>
 
 #include "EntityItem.h"

libraries/entities/src/ModelEntityItem.cpp

@@ -10,6 +10,7 @@
 //
 
 #include <ByteCountCoding.h>
+#include <GLMHelpers.h>
 
 #include "EntityTree.h"
 #include "EntityTreeElement.h"

libraries/octree/src/OctreeEditPacketSender.cpp

@@ -225,7 +225,7 @@ void OctreeEditPacketSender::queuePacketToNodes(unsigned char* buffer, size_t le
 
 // NOTE: editPacketBuffer - is JUST the octcode/color and does not contain the packet header!
 void OctreeEditPacketSender::queueOctreeEditMessage(PacketType type, unsigned char* editPacketBuffer,
-                                                    ssize_t length, qint64 satoshiCost) {
+                                                    size_t length, qint64 satoshiCost) {
                                                     
     bool wantDebug = false;                                                    
     if (wantDebug) {

libraries/octree/src/OctreeQuery.cpp

@@ -9,7 +9,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-//#include <PacketHeaders.h>
+#include <PacketHeaders.h>
 //#include <SharedUtil.h>
 #include <GLMHelpers.h>
 

tests/octree/CMakeLists.txt

@@ -5,15 +5,6 @@ setup_hifi_project(Script Network)
 include_glm()
 
 # link in the shared libraries
-//link_hifi_library(entities ${TARGET_NAME} ${ROOT_DIR})
-//link_hifi_library(octree ${TARGET_NAME} ${ROOT_DIR})
-//link_hifi_library(audio ${TARGET_NAME} ${ROOT_DIR})
-//link_hifi_library(networking ${TARGET_NAME} ${ROOT_DIR})
-//link_hifi_library(animation ${TARGET_NAME} ${ROOT_DIR})
-//link_hifi_library(fbx ${TARGET_NAME} ${ROOT_DIR})
-//link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
-//link_hifi_library(voxels ${TARGET_NAME} ${ROOT_DIR})
-
 link_hifi_libraries(animation fbx entities networking octree shared)
 
 link_shared_dependencies()