Synchronized LLCommon with V3 and added a few comments

master
Ansariel 2013-07-01 15:17:26 +02:00
parent 806bf7e317
commit fe6e02ec29
3 changed files with 7 additions and 7 deletions

View File

@ -152,6 +152,8 @@ inline S32 LLDynamicArray<Type,BlockSize>::put(const Type &obj)
template <typename Type,int BlockSize>
inline void LLDynamicArray<Type,BlockSize>::operator+=(const LLDynamicArray<Type,BlockSize> &other)
{
// <FS:ND> Fix for GCC 4.7.1
//insert(this->end(), other.begin(), other.end());
this->insert(this->end(), other.begin(), other.end());
}

View File

@ -102,10 +102,6 @@ LLVoidListener<LISTENER> voidlistener(const LISTENER& listener)
namespace LLEventDetail
{
/// Implementation for listenerNameForCoro()
LL_COMMON_API std::string listenerNameForCoroImpl(const void* self_id);
/**
* waitForEventOn() permits a coroutine to temporarily listen on an
* LLEventPump any number of times. We don't really want to have to ask
@ -133,6 +129,9 @@ namespace LLEventDetail
return listenerNameForCoroImpl(self.get_id());
}
/// Implementation for listenerNameForCoro()
LL_COMMON_API std::string listenerNameForCoroImpl(const void* self_id);
/**
* Implement behavior described for postAndWait()'s @a replyPumpNamePath
* parameter:

View File

@ -87,12 +87,11 @@ public:
FT_BASIC_ROOT = 52,
// Ansariel: Folder types for our own virtual system folders
//-TT - adjusted for new LL types
// <FS:Ansariel> Folder types for our own virtual system folders
FT_FIRESTORM = 53,
FT_PHOENIX = 54,
FT_RLV = 55,
// END Ansariel: Folder types for our own virtual system folders
// </FS:Ansariel> Folder types for our own virtual system folders
FT_COUNT,