livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert extern template link optimization until I can build/test on PC

master
James Cook 2009-11-29 10:19:17 -08:00
parent 491cbc5de6
commit b50ba67bd8
13 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llui/llbutton.cpp
View File

@ -57,8 +57,8 @@
static LLDefaultChildRegistry::Register<LLButton> r("button");
// Compiler optimization, generate extern template
template class LLButton* LLView::getChild<class LLButton>(
const std::string& name, BOOL recurse) const;
//template class LLButton* LLView::getChild<class LLButton>(
// const std::string& name, BOOL recurse) const;
// globals loaded from settings.xml
S32 LLBUTTON_H_PAD = 0;

4
indra/llui/llcheckboxctrl.cpp
View File

@ -51,8 +51,8 @@ const U32 MAX_STRING_LENGTH = 10;
static LLDefaultChildRegistry::Register<LLCheckBoxCtrl> r("check_box");
// Compiler optimization, generate extern template
template class LLCheckBoxCtrl* LLView::getChild<class LLCheckBoxCtrl>(
const std::string& name, BOOL recurse) const;
//template class LLCheckBoxCtrl* LLView::getChild<class LLCheckBoxCtrl>(
// const std::string& name, BOOL recurse) const;
LLCheckBoxCtrl::Params::Params()
: text_enabled_color("text_enabled_color"),

4
indra/llui/lllineeditor.cpp
View File

@ -72,8 +72,8 @@ const F32 TRIPLE_CLICK_INTERVAL = 0.3f; // delay between double and triple click
static LLDefaultChildRegistry::Register<LLLineEditor> r1("line_editor");
// Compiler optimization, generate extern template
template class LLLineEditor* LLView::getChild<class LLLineEditor>(
const std::string& name, BOOL recurse) const;
//template class LLLineEditor* LLView::getChild<class LLLineEditor>(
// const std::string& name, BOOL recurse) const;
//
// Member functions

4
indra/llui/llpanel.cpp
View File

@ -59,8 +59,8 @@
static LLDefaultChildRegistry::Register<LLPanel> r1("panel", &LLPanel::fromXML);
// Compiler optimization, generate extern template
template class LLPanel* LLView::getChild<class LLPanel>(
const std::string& name, BOOL recurse) const;
//template class LLPanel* LLView::getChild<class LLPanel>(
// const std::string& name, BOOL recurse) const;
LLPanel::LocalizedString::LocalizedString()
: name("name"),

4
indra/llui/lltextbox.cpp
View File

@ -41,8 +41,8 @@
static LLDefaultChildRegistry::Register<LLTextBox> r("text");
// Compiler optimization, generate extern template
template class LLTextBox* LLView::getChild<class LLTextBox>(
const std::string& name, BOOL recurse) const;
//template class LLTextBox* LLView::getChild<class LLTextBox>(
// const std::string& name, BOOL recurse) const;
LLTextBox::LLTextBox(const LLTextBox::Params& p)
: LLTextBase(p),

4
indra/llui/lltexteditor.cpp
View File

@ -74,8 +74,8 @@
static LLDefaultChildRegistry::Register<LLTextEditor> r("simple_text_editor");
// Compiler optimization, generate extern template
template class LLTextEditor* LLView::getChild<class LLTextEditor>(
const std::string& name, BOOL recurse) const;
//template class LLTextEditor* LLView::getChild<class LLTextEditor>(
// const std::string& name, BOOL recurse) const;
//
// Constants

4
indra/llui/lluictrl.cpp
View File

@ -41,8 +41,8 @@
static LLDefaultChildRegistry::Register<LLUICtrl> r("ui_ctrl");
// Compiler optimization, generate extern template
template class LLUICtrl* LLView::getChild<class LLUICtrl>(
const std::string& name, BOOL recurse) const;
//template class LLUICtrl* LLView::getChild<class LLUICtrl>(
// const std::string& name, BOOL recurse) const;
LLUICtrl::Params::Params()
: tab_stop("tab_stop", true),

2
indra/llui/lluictrlfactory.h
View File

@ -109,7 +109,7 @@ extern LLFastTimer::DeclareTimer FTM_WIDGET_CONSTRUCTION;
extern LLFastTimer::DeclareTimer FTM_INIT_FROM_PARAMS;
// Build time optimization, generate this once in .cpp file
extern template class LLUICtrlFactory* LLSingleton<class LLUICtrlFactory>::getInstance();
//extern template class LLUICtrlFactory* LLSingleton<class LLUICtrlFactory>::getInstance();
class LLUICtrlFactory : public LLSingleton<LLUICtrlFactory>
{

2
indra/llui/llview.cpp
View File

@ -77,7 +77,7 @@ BOOL LLView::sIsDrawing = FALSE;
#endif
// Compiler optimization, generate extern template
template class LLView* LLView::getChild<class LLView>(const std::string& name, BOOL recurse) const;
//template class LLView* LLView::getChild<class LLView>(const std::string& name, BOOL recurse) const;
static LLDefaultChildRegistry::Register<LLView> r("view");

32
indra/llui/llview.h
View File

@ -661,21 +661,21 @@ template <class T> T* LLView::getChild(const std::string& name, BOOL recurse) co
// Compiler optimization - don't generate these specializations inline,
// require explicit specialization. See llbutton.cpp for an example.
extern template class LLButton* LLView::getChild<class LLButton>(
const std::string& name, BOOL recurse) const;
extern template class LLCheckBoxCtrl* LLView::getChild<class LLCheckBoxCtrl>(
const std::string& name, BOOL recurse) const;
extern template class LLLineEditor* LLView::getChild<class LLLineEditor>(
const std::string& name, BOOL recurse) const;
extern template class LLPanel* LLView::getChild<class LLPanel>(
const std::string& name, BOOL recurse) const;
extern template class LLTextBox* LLView::getChild<class LLTextBox>(
const std::string& name, BOOL recurse) const;
extern template class LLTextEditor* LLView::getChild<class LLTextEditor>(
const std::string& name, BOOL recurse) const;
extern template class LLUICtrl* LLView::getChild<class LLUICtrl>(
const std::string& name, BOOL recurse) const;
extern template class LLView* LLView::getChild<class LLView>(
const std::string& name, BOOL recurse) const;
//extern template class LLButton* LLView::getChild<class LLButton>(
// const std::string& name, BOOL recurse) const;
//extern template class LLCheckBoxCtrl* LLView::getChild<class LLCheckBoxCtrl>(
// const std::string& name, BOOL recurse) const;
//extern template class LLLineEditor* LLView::getChild<class LLLineEditor>(
// const std::string& name, BOOL recurse) const;
//extern template class LLPanel* LLView::getChild<class LLPanel>(
// const std::string& name, BOOL recurse) const;
//extern template class LLTextBox* LLView::getChild<class LLTextBox>(
// const std::string& name, BOOL recurse) const;
//extern template class LLTextEditor* LLView::getChild<class LLTextEditor>(
// const std::string& name, BOOL recurse) const;
//extern template class LLUICtrl* LLView::getChild<class LLUICtrl>(
// const std::string& name, BOOL recurse) const;
//extern template class LLView* LLView::getChild<class LLView>(
// const std::string& name, BOOL recurse) const;
#endif //LL_LLVIEW_H

2
indra/newview/llbottomtray.h
View File

@ -48,7 +48,7 @@ class LLNearbyChatBar;
class LLIMChiclet;
// Build time optimization, generate this once in .cpp file
extern template class LLBottomTray* LLSingleton<class LLBottomTray>::getInstance();
//extern template class LLBottomTray* LLSingleton<class LLBottomTray>::getInstance();
class LLBottomTray
: public LLSingleton<LLBottomTray>

2
indra/newview/llselectmgr.h
View File

@ -324,7 +324,7 @@ private:
typedef LLSafeHandle<LLObjectSelection> LLObjectSelectionHandle;
// Build time optimization, generate this once in .cpp file
extern template class LLSelectMgr* LLSingleton<class LLSelectMgr>::getInstance();
//extern template class LLSelectMgr* LLSingleton<class LLSelectMgr>::getInstance();
class LLSelectMgr : public LLEditMenuHandler, public LLSingleton<LLSelectMgr>
{

2
indra/newview/llviewercamera.h
View File

@ -53,7 +53,7 @@ const BOOL FOR_SELECTION = TRUE;
const BOOL NOT_FOR_SELECTION = FALSE;
// Build time optimization, generate this once in .cpp file
extern template class LLViewerCamera* LLSingleton<class LLViewerCamera>::getInstance();
//extern template class LLViewerCamera* LLSingleton<class LLViewerCamera>::getInstance();
class LLViewerCamera : public LLCamera, public LLSingleton<LLViewerCamera>
{