diff --git a/lib/NetPacks.h b/lib/NetPacks.h index f82189e48..2d7f30e15 100644 --- a/lib/NetPacks.h +++ b/lib/NetPacks.h @@ -1516,7 +1516,7 @@ struct ObstaclesRemoved : public CPackForClient //3014 }; //FIXME: figure out why gcc fails to find type_info for this class with -fvisibility=hidden flag set -#ifdef __linux__ +#if defined(__linux__) || defined(__APPLE__) struct DLL_LINKAGE CatapultAttack : public CPackForClient //3015 #else struct CatapultAttack : public CPackForClient //3015 diff --git a/lib/mapObjects/CObjectClassesHandler.h b/lib/mapObjects/CObjectClassesHandler.h index 403b18830..3d5886901 100644 --- a/lib/mapObjects/CObjectClassesHandler.h +++ b/lib/mapObjects/CObjectClassesHandler.h @@ -65,7 +65,7 @@ public: walkersStrength(0) {} - bool operator <(const CArmyStructure & other) + bool operator <(const CArmyStructure & other) const { return this->totalStrength < other.totalStrength; }