From ccbbf31beb2a10ac0dd5fe2e392f2bb418faa427 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 25 Apr 2013 17:10:09 -0700 Subject: [PATCH] fix for extraneous typedefs and reference to AgentListIterator as friend --- interface/src/main.cpp | 2 +- libraries/shared/src/AgentList.h | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/interface/src/main.cpp b/interface/src/main.cpp index ec7c17a58d..4fad6f922b 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -813,7 +813,7 @@ void display(void) // float firstPersonPitch = 20.0f; // float firstPersonUpShift = 0.1f; // float firstPersonDistance = 0.0f; -// float firstPersonTightness = 100.0f; +// float firstPersonT ightness = 100.0f; float thirdPersonPitch = 0.0f; float thirdPersonUpShift = -0.1f; diff --git a/libraries/shared/src/AgentList.h b/libraries/shared/src/AgentList.h index 92a80ddc08..1687fc71c4 100644 --- a/libraries/shared/src/AgentList.h +++ b/libraries/shared/src/AgentList.h @@ -39,11 +39,6 @@ public: static AgentList* getInstance(); typedef AgentListIterator iterator; - typedef ptrdiff_t difference_type; - typedef size_t size_type; - typedef Agent value_type; - typedef Agent * pointer; - typedef Agent & reference; AgentListIterator begin() const; AgentListIterator end() const; @@ -84,7 +79,7 @@ public: void startPingUnknownAgentsThread(); void stopPingUnknownAgentsThread(); - friend AgentListIterator; + friend ::AgentListIterator; private: static AgentList* _sharedInstance;