diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h index 017d48a0e..b13eddc4e 100644 --- a/indra/llmath/lloctree.h +++ b/indra/llmath/lloctree.h @@ -416,7 +416,7 @@ public: { //we have data mData.erase(data); mElementCount = mData.size(); - notifyRemoval(data); + this->notifyRemoval(data); checkAlive(); return true; } @@ -454,7 +454,7 @@ public: { mData.erase(data); mElementCount = mData.size(); - notifyRemoval(data); + this->notifyRemoval(data); llwarns << "FOUND!" << llendl; checkAlive(); return; @@ -663,7 +663,7 @@ public: //(don't notify listeners of addition) for (U32 i = 0; i < child->getChildCount(); i++) { - addChild(child->getChild(i), TRUE); + this->addChild(child->getChild(i), TRUE); } //destroy child @@ -707,10 +707,10 @@ public: return false; } - if (this->getSize()[0] > data->getBinRadius() && isInside(data->getPositionGroup())) + if (this->getSize()[0] > data->getBinRadius() && this->isInside(data->getPositionGroup())) { //we got it, just act like a branch - oct_node* node = getNodeAt(data); + oct_node* node = this->getNodeAt(data); if (node == this) { LLOctreeNode::insert(data); @@ -723,7 +723,7 @@ public: else if (this->getChildCount() == 0) { //first object being added, just wrap it up - while (!(this->getSize()[0] > data->getBinRadius() && isInside(data->getPositionGroup()))) + while (!(this->getSize()[0] > data->getBinRadius() && this->isInside(data->getPositionGroup()))) { LLVector4a center, size; center = this->getCenter(); @@ -738,7 +738,7 @@ public: } else { - while (!(this->getSize()[0] > data->getBinRadius() && isInside(data->getPositionGroup()))) + while (!(this->getSize()[0] > data->getBinRadius() && this->isInside(data->getPositionGroup()))) { //the data is outside the root node, we need to grow LLVector4a center(this->getCenter()); @@ -764,7 +764,7 @@ public: //clear our children and add the root copy this->clearChildren(); - addChild(newnode); + this->addChild(newnode); } //insert the data diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp index ccefdb56c..b2f5ce471 100644 --- a/indra/llmessage/llcurl.cpp +++ b/indra/llmessage/llcurl.cpp @@ -202,8 +202,8 @@ void LLCurl::Responder::completedHeader(U32 status, const std::string& reason, c } -namespace boost -{ +//namespace boost +//{ void intrusive_ptr_add_ref(LLCurl::Responder* p) { ++p->mReferenceCount; @@ -216,7 +216,7 @@ namespace boost delete p; } } -}; +//}; ////////////////////////////////////////////////////////////////////////////// diff --git a/indra/llmessage/llcurl.h b/indra/llmessage/llcurl.h index 1609530a3..fa8465bfe 100644 --- a/indra/llmessage/llcurl.h +++ b/indra/llmessage/llcurl.h @@ -378,11 +378,11 @@ private: void cleanupMulti(LLCurl::Multi* multi) ; } ; -namespace boost -{ +//namespace boost +//{ void intrusive_ptr_add_ref(LLCurl::Responder* p); void intrusive_ptr_release(LLCurl::Responder* p); -}; +//}; class LLCurlRequest diff --git a/indra/llmessage/lliopipe.h b/indra/llmessage/lliopipe.h index cbd17b5a3..884089e97 100644 --- a/indra/llmessage/lliopipe.h +++ b/indra/llmessage/lliopipe.h @@ -250,13 +250,13 @@ protected: LLPumpIO* pump) = 0; private: - friend void boost::intrusive_ptr_add_ref(LLIOPipe* p); - friend void boost::intrusive_ptr_release(LLIOPipe* p); + friend void /*boost::*/intrusive_ptr_add_ref(LLIOPipe* p); + friend void /*boost::*/intrusive_ptr_release(LLIOPipe* p); U32 mReferenceCount; }; -namespace boost -{ +//namespace boost +//{ inline void intrusive_ptr_add_ref(LLIOPipe* p) { ++p->mReferenceCount; @@ -268,7 +268,7 @@ namespace boost delete p; } } -}; +//}; #if 0 diff --git a/indra/llmessage/llregionpresenceverifier.cpp b/indra/llmessage/llregionpresenceverifier.cpp index 932cbf375..01d78ed3e 100644 --- a/indra/llmessage/llregionpresenceverifier.cpp +++ b/indra/llmessage/llregionpresenceverifier.cpp @@ -32,8 +32,8 @@ #include "net.h" #include "message.h" -namespace boost -{ +//namespace boost +//{ void intrusive_ptr_add_ref(LLRegionPresenceVerifier::Response* p) { ++p->mReferenceCount; @@ -46,7 +46,7 @@ namespace boost delete p; } } -}; +//}; LLRegionPresenceVerifier::Response::~Response() { diff --git a/indra/llmessage/llregionpresenceverifier.h b/indra/llmessage/llregionpresenceverifier.h index 5e8251e51..9b45e78b5 100644 --- a/indra/llmessage/llregionpresenceverifier.h +++ b/indra/llmessage/llregionpresenceverifier.h @@ -89,10 +89,10 @@ public: }; }; -namespace boost -{ +//namespace boost +//{ void intrusive_ptr_add_ref(LLRegionPresenceVerifier::Response* p); void intrusive_ptr_release(LLRegionPresenceVerifier::Response* p); -}; +//}; #endif //LL_LLREGIONPRESENCEVERIFIER_H diff --git a/indra/llmessage/net.cpp b/indra/llmessage/net.cpp index 85aef5da0..6e232aa24 100644 --- a/indra/llmessage/net.cpp +++ b/indra/llmessage/net.cpp @@ -36,6 +36,7 @@ #include #include #else + #include #include #include #include diff --git a/indra/llrender/llvertexbuffer.h b/indra/llrender/llvertexbuffer.h index ceaa70c3b..0ab73af1d 100644 --- a/indra/llrender/llvertexbuffer.h +++ b/indra/llrender/llvertexbuffer.h @@ -90,6 +90,7 @@ class LLGLFence public: virtual void placeFence() = 0; virtual void wait() = 0; + virtual ~LLGLFence() {} }; //============================================================================ diff --git a/indra/llui/lldelayeduidelete.h b/indra/llui/lldelayeduidelete.h index 043e6972e..131e43424 100644 --- a/indra/llui/lldelayeduidelete.h +++ b/indra/llui/lldelayeduidelete.h @@ -7,6 +7,7 @@ class LLDeleteJob { public: virtual BOOL work(U32& completed); + virtual ~LLDeleteJob() {} }; class LLViewDeleteJob : public LLDeleteJob { diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h index ab2095776..7285d3c48 100644 --- a/indra/llxuixml/llinitparam.h +++ b/indra/llxuixml/llinitparam.h @@ -838,7 +838,7 @@ namespace LLInitParam BaseBlock::addParam(block_descriptor, param_descriptor, name); } - setValue(value); + this->setValue(value); } bool isProvided() const { return Param::anyProvided(); } @@ -926,7 +926,7 @@ namespace LLInitParam void set(value_assignment_t val, bool flag_as_provided = true) { param_value_t::clearValueName(); - setValue(val); + this->setValue(val); setProvided(flag_as_provided); } @@ -1068,7 +1068,7 @@ namespace LLInitParam // assign block contents to this param-that-is-a-block void set(value_assignment_t val, bool flag_as_provided = true) { - setValue(val); + this->setValue(val); param_value_t::clearValueName(); // force revalidation of block // next call to isProvided() will update provision status based on validity @@ -1723,7 +1723,7 @@ namespace LLInitParam Optional& operator =(value_assignment_t val) { - set(val); + this->set(val); return *this; } @@ -1752,7 +1752,7 @@ namespace LLInitParam Mandatory& operator =(value_assignment_t val) { - set(val); + this->set(val); return *this; } diff --git a/indra/newview/llsurfacepatch.cpp b/indra/newview/llsurfacepatch.cpp index 06431d428..0b8e4c608 100644 --- a/indra/newview/llsurfacepatch.cpp +++ b/indra/newview/llsurfacepatch.cpp @@ -236,8 +236,8 @@ void LLSurfacePatch::eval(const U32 x, const U32 y, const U32 stride, LLVector3 const F32 xyScaleInv = (1.f / xyScale)*(0.2222222222f); F32 vec[3] = { - fmod((F32)(mOriginGlobal.mdV[0] + x)*xyScaleInv, 256.f), - fmod((F32)(mOriginGlobal.mdV[1] + y)*xyScaleInv, 256.f), + (F32)fmod((mOriginGlobal.mdV[0] + x)*xyScaleInv, 256.f), + (F32)fmod((mOriginGlobal.mdV[1] + y)*xyScaleInv, 256.f), 0.f }; F32 rand_val = llclamp(noise2(vec)* 0.75f + 0.5f, 0.f, 1.f);