diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2010-11-01 15:49:04 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2010-11-01 15:49:04 -0400 |
| commit | 2125bc0bbb3a5493b0b96bf68889b1f44b2db011 (patch) | |
| tree | 435d7da8447a8baa28c418baba52e4a5de2240c4 /indra | |
| parent | 3bf2b7b41e4bd489b2dff9555b6553844b6df532 (diff) | |
On Windows, disable this-used-in-initializer warning.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/viewer_components/updater/llupdatechecker.cpp | 3 | ||||
| -rw-r--r-- | indra/viewer_components/updater/llupdaterservice.cpp | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/indra/viewer_components/updater/llupdatechecker.cpp b/indra/viewer_components/updater/llupdatechecker.cpp index 941210d35b..331d0269d4 100644 --- a/indra/viewer_components/updater/llupdatechecker.cpp +++ b/indra/viewer_components/updater/llupdatechecker.cpp @@ -30,6 +30,9 @@ #include "llupdatechecker.h" #include "lluri.h" +#if LL_WINDOWS +#pragma warning (disable : 4355) // 'this' used in initializer list: yes, intentionally +#endif class LLUpdateChecker::Implementation: public LLHTTPClient::Responder diff --git a/indra/viewer_components/updater/llupdaterservice.cpp b/indra/viewer_components/updater/llupdaterservice.cpp index 2633dbc015..1d0ead3cd4 100644 --- a/indra/viewer_components/updater/llupdaterservice.cpp +++ b/indra/viewer_components/updater/llupdaterservice.cpp @@ -34,6 +34,10 @@ #include <boost/scoped_ptr.hpp> #include <boost/weak_ptr.hpp> +#if LL_WINDOWS +#pragma warning (disable : 4355) // 'this' used in initializer list: yes, intentionally +#endif + boost::weak_ptr<LLUpdaterServiceImpl> gUpdater; class LLUpdaterServiceImpl : |