Fix for mac build errors following r121524 commit for DEV-27646.

meow-7.2.2
Brad Kittenbrink 2009-05-27 17:41:57 +00:00
parent a81c084deb
commit 46e7bd31cd
2 changed files with 8 additions and 4 deletions

View File

@ -148,8 +148,6 @@ protected:
}
};
template class LL_COMMON_API std::set<QueuedRequest*, queued_request_less>;
//------------------------------------------------------------------------

View File

@ -638,9 +638,14 @@ protected:
* params << "[{'version':i1}," << LLSDOStreamer<LLSDNotationFormatter>(sd)
* << "]";
* </code>
*
* *NOTE - formerly this class inherited from its template parameter Formatter,
* but all insnatiations passed in LLRefCount subclasses. This conflicted with
* the auto allocation intended for this class template (demonstrated in the
* example above). -brad
*/
template <class Formatter>
class LLSDOStreamer : public Formatter
class LLSDOStreamer
{
public:
/**
@ -661,7 +666,8 @@ public:
std::ostream& str,
const LLSDOStreamer<Formatter>& formatter)
{
formatter.format(formatter.mSD, str, formatter.mOptions);
LLPointer<Formatter> f = new Formatter;
f->format(formatter.mSD, str, formatter.mOptions);
return str;
}