Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed compile errors for gcc4.7 (also reported by clang)

Browse Source
This commit is contained in:
Lirusaito
2012-04-28 21:29:52 -04:00
parent 4799899317
commit 8e6063e7b9
11 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
indra/llmath/lloctree.h
View File

@@ -416,7 +416,7 @@ public:
{ //we have data { //we have data
mData.erase(data); mData.erase(data);
mElementCount = mData.size(); mElementCount = mData.size();
notifyRemoval(data); this->notifyRemoval(data);
checkAlive(); checkAlive();
return true; return true;
} }
@@ -454,7 +454,7 @@ public:
{ {
mData.erase(data); mData.erase(data);
mElementCount = mData.size(); mElementCount = mData.size();
notifyRemoval(data); this->notifyRemoval(data);
llwarns << "FOUND!" << llendl; llwarns << "FOUND!" << llendl;
checkAlive(); checkAlive();
return; return;
@@ -663,7 +663,7 @@ public:
//(don't notify listeners of addition) //(don't notify listeners of addition)
for (U32 i = 0; i < child->getChildCount(); i++) for (U32 i = 0; i < child->getChildCount(); i++)
{ {
addChild(child->getChild(i), TRUE); this->addChild(child->getChild(i), TRUE);
} }
//destroy child //destroy child
@@ -707,10 +707,10 @@ public:
return false; 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 //we got it, just act like a branch
oct_node* node = getNodeAt(data); oct_node* node = this->getNodeAt(data);
if (node == this) if (node == this)
{ {
LLOctreeNode<T>::insert(data); LLOctreeNode<T>::insert(data);
@@ -723,7 +723,7 @@ public:
else if (this->getChildCount() == 0) else if (this->getChildCount() == 0)
{ {
//first object being added, just wrap it up //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; LLVector4a center, size;
center = this->getCenter(); center = this->getCenter();
@@ -738,7 +738,7 @@ public:
} }
else 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 //the data is outside the root node, we need to grow
LLVector4a center(this->getCenter()); LLVector4a center(this->getCenter());
@@ -764,7 +764,7 @@ public:
//clear our children and add the root copy //clear our children and add the root copy
this->clearChildren(); this->clearChildren();
addChild(newnode); this->addChild(newnode);
} }
//insert the data //insert the data

6
indra/llmessage/llcurl.cpp
View File

@@ -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) void intrusive_ptr_add_ref(LLCurl::Responder* p)
{ {
++p->mReferenceCount; ++p->mReferenceCount;
@@ -216,7 +216,7 @@ namespace boost
delete p; delete p;
} }
} }
}; //};
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////

6
indra/llmessage/llcurl.h
View File

@@ -378,11 +378,11 @@ private:
void cleanupMulti(LLCurl::Multi* multi) ; void cleanupMulti(LLCurl::Multi* multi) ;
} ; } ;
namespace boost //namespace boost
{ //{
void intrusive_ptr_add_ref(LLCurl::Responder* p); void intrusive_ptr_add_ref(LLCurl::Responder* p);
void intrusive_ptr_release(LLCurl::Responder* p); void intrusive_ptr_release(LLCurl::Responder* p);
}; //};
class LLCurlRequest class LLCurlRequest

10
indra/llmessage/lliopipe.h
View File

@@ -250,13 +250,13 @@ protected:
LLPumpIO* pump) = 0; LLPumpIO* pump) = 0;
private: private:
friend void boost::intrusive_ptr_add_ref(LLIOPipe* p); friend void /*boost::*/intrusive_ptr_add_ref(LLIOPipe* p);
friend void boost::intrusive_ptr_release(LLIOPipe* p); friend void /*boost::*/intrusive_ptr_release(LLIOPipe* p);
U32 mReferenceCount; U32 mReferenceCount;
}; };
namespace boost //namespace boost
{ //{
inline void intrusive_ptr_add_ref(LLIOPipe* p) inline void intrusive_ptr_add_ref(LLIOPipe* p)
{ {
++p->mReferenceCount; ++p->mReferenceCount;
@@ -268,7 +268,7 @@ namespace boost
delete p; delete p;
} }
} }
}; //};
#if 0 #if 0

6
indra/llmessage/llregionpresenceverifier.cpp
View File

@@ -32,8 +32,8 @@
#include "net.h" #include "net.h"
#include "message.h" #include "message.h"
namespace boost //namespace boost
{ //{
void intrusive_ptr_add_ref(LLRegionPresenceVerifier::Response* p) void intrusive_ptr_add_ref(LLRegionPresenceVerifier::Response* p)
{ {
++p->mReferenceCount; ++p->mReferenceCount;
@@ -46,7 +46,7 @@ namespace boost
delete p; delete p;
} }
} }
}; //};
LLRegionPresenceVerifier::Response::~Response() LLRegionPresenceVerifier::Response::~Response()
{ {

6
indra/llmessage/llregionpresenceverifier.h
View File

@@ -89,10 +89,10 @@ public:
}; };
}; };
namespace boost //namespace boost
{ //{
void intrusive_ptr_add_ref(LLRegionPresenceVerifier::Response* p); void intrusive_ptr_add_ref(LLRegionPresenceVerifier::Response* p);
void intrusive_ptr_release(LLRegionPresenceVerifier::Response* p); void intrusive_ptr_release(LLRegionPresenceVerifier::Response* p);
}; //};
#endif //LL_LLREGIONPRESENCEVERIFIER_H #endif //LL_LLREGIONPRESENCEVERIFIER_H

1
indra/llmessage/net.cpp
View File

@@ -36,6 +36,7 @@
#include <winsock2.h> #include <winsock2.h>
#include <windows.h> #include <windows.h>
#else #else
#include <unistd.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>

1
indra/llrender/llvertexbuffer.h
View File

@@ -90,6 +90,7 @@ class LLGLFence
public: public:
virtual void placeFence() = 0; virtual void placeFence() = 0;
virtual void wait() = 0; virtual void wait() = 0;
virtual ~LLGLFence() {}
}; };
//============================================================================ //============================================================================

1
indra/llui/lldelayeduidelete.h
View File

@@ -7,6 +7,7 @@ class LLDeleteJob
{ {
public: public:
virtual BOOL work(U32& completed); virtual BOOL work(U32& completed);
virtual ~LLDeleteJob() {}
}; };
class LLViewDeleteJob : public LLDeleteJob class LLViewDeleteJob : public LLDeleteJob
{ {

10
indra/llxuixml/llinitparam.h
View File

@@ -838,7 +838,7 @@ namespace LLInitParam
BaseBlock::addParam(block_descriptor, param_descriptor, name); BaseBlock::addParam(block_descriptor, param_descriptor, name);
} }
setValue(value); this->setValue(value);
} }
bool isProvided() const { return Param::anyProvided(); } bool isProvided() const { return Param::anyProvided(); }
@@ -926,7 +926,7 @@ namespace LLInitParam
void set(value_assignment_t val, bool flag_as_provided = true) void set(value_assignment_t val, bool flag_as_provided = true)
{ {
param_value_t::clearValueName(); param_value_t::clearValueName();
setValue(val); this->setValue(val);
setProvided(flag_as_provided); setProvided(flag_as_provided);
} }
@@ -1068,7 +1068,7 @@ namespace LLInitParam
// assign block contents to this param-that-is-a-block // assign block contents to this param-that-is-a-block
void set(value_assignment_t val, bool flag_as_provided = true) void set(value_assignment_t val, bool flag_as_provided = true)
{ {
setValue(val); this->setValue(val);
param_value_t::clearValueName(); param_value_t::clearValueName();
// force revalidation of block // force revalidation of block
// next call to isProvided() will update provision status based on validity // next call to isProvided() will update provision status based on validity
@@ -1723,7 +1723,7 @@ namespace LLInitParam
Optional& operator =(value_assignment_t val) Optional& operator =(value_assignment_t val)
{ {
set(val); this->set(val);
return *this; return *this;
} }
@@ -1752,7 +1752,7 @@ namespace LLInitParam
Mandatory& operator =(value_assignment_t val) Mandatory& operator =(value_assignment_t val)
{ {
set(val); this->set(val);
return *this; return *this;
} }

4
indra/newview/llsurfacepatch.cpp
View File

@@ -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); const F32 xyScaleInv = (1.f / xyScale)*(0.2222222222f);
F32 vec[3] = { F32 vec[3] = {
fmod((F32)(mOriginGlobal.mdV[0] + x)*xyScaleInv, 256.f), (F32)fmod((mOriginGlobal.mdV[0] + x)*xyScaleInv, 256.f),
fmod((F32)(mOriginGlobal.mdV[1] + y)*xyScaleInv, 256.f), (F32)fmod((mOriginGlobal.mdV[1] + y)*xyScaleInv, 256.f),
0.f 0.f
}; };
F32 rand_val = llclamp(noise2(vec)* 0.75f + 0.5f, 0.f, 1.f); F32 rand_val = llclamp(noise2(vec)* 0.75f + 0.5f, 0.f, 1.f);