From daffb00bf29441678b6021ec35b7af9f2bf798f2 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 18 Aug 2014 15:41:20 -0700 Subject: [PATCH] build issues fixed after merge --- libraries/entities/src/EntityEditPacketSender.cpp | 2 +- libraries/entities/src/EntityEditPacketSender.h | 2 +- libraries/entities/src/EntityItem.cpp | 5 +++-- libraries/entities/src/EntityItem.h | 2 +- libraries/entities/src/EntityItemProperties.cpp | 1 + libraries/entities/src/ModelEntityItem.cpp | 1 + libraries/octree/src/OctreeEditPacketSender.cpp | 2 +- libraries/octree/src/OctreeQuery.cpp | 2 +- tests/octree/CMakeLists.txt | 9 --------- 9 files changed, 10 insertions(+), 16 deletions(-) diff --git a/libraries/entities/src/EntityEditPacketSender.cpp b/libraries/entities/src/EntityEditPacketSender.cpp index 863d2ffb40..9ecf22d72c 100644 --- a/libraries/entities/src/EntityEditPacketSender.cpp +++ b/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); diff --git a/libraries/entities/src/EntityEditPacketSender.h b/libraries/entities/src/EntityEditPacketSender.h index 8d6ddf7b79..69171ae16b 100644 --- a/libraries/entities/src/EntityEditPacketSender.h +++ b/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 diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp index ccdd569c27..809673e27f 100644 --- a/libraries/entities/src/EntityItem.cpp +++ b/libraries/entities/src/EntityItem.cpp @@ -12,6 +12,7 @@ #include #include +#include #include #include #include // 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); diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h index a17172ba74..5df1bed843 100644 --- a/libraries/entities/src/EntityItem.h +++ b/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 { diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp index 60174eda0a..405db34ab1 100644 --- a/libraries/entities/src/EntityItemProperties.cpp +++ b/libraries/entities/src/EntityItemProperties.cpp @@ -13,6 +13,7 @@ #include #include +#include #include #include "EntityItem.h" diff --git a/libraries/entities/src/ModelEntityItem.cpp b/libraries/entities/src/ModelEntityItem.cpp index 3347ee9c3e..7011233871 100644 --- a/libraries/entities/src/ModelEntityItem.cpp +++ b/libraries/entities/src/ModelEntityItem.cpp @@ -10,6 +10,7 @@ // #include +#include #include "EntityTree.h" #include "EntityTreeElement.h" diff --git a/libraries/octree/src/OctreeEditPacketSender.cpp b/libraries/octree/src/OctreeEditPacketSender.cpp index eb7b63f645..25f4142fc6 100644 --- a/libraries/octree/src/OctreeEditPacketSender.cpp +++ b/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) { diff --git a/libraries/octree/src/OctreeQuery.cpp b/libraries/octree/src/OctreeQuery.cpp index dd3ea6df93..f40276952b 100644 --- a/libraries/octree/src/OctreeQuery.cpp +++ b/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 +#include //#include #include diff --git a/tests/octree/CMakeLists.txt b/tests/octree/CMakeLists.txt index 6fd946d2e5..45277d6165 100644 --- a/tests/octree/CMakeLists.txt +++ b/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()