diff options
| author | McCabe Maxsted | 2009-11-13 18:43:44 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-11-13 18:43:44 -0700 |
| commit | 966e080036a2d3aafa19ddeec634c048e1d2fd7e (patch) | |
| tree | 7bae2b3193117956df9d8971809cd7f79445ee8c /linden/indra | |
| parent | Viewer compiles, but still trying to get everything to link on Windows (diff) | |
| download | meta-impy-966e080036a2d3aafa19ddeec634c048e1d2fd7e.zip meta-impy-966e080036a2d3aafa19ddeec634c048e1d2fd7e.tar.gz meta-impy-966e080036a2d3aafa19ddeec634c048e1d2fd7e.tar.bz2 meta-impy-966e080036a2d3aafa19ddeec634c048e1d2fd7e.tar.xz | |
Disable unreachable code in boost/lexical_cast.hpp errors in Windows
Diffstat (limited to 'linden/indra')
| -rw-r--r-- | linden/indra/newview/llpaneldirfind.cpp | 9 | ||||
| -rw-r--r-- | linden/indra/newview/llvoavatar.cpp | 7 |
2 files changed, 15 insertions, 1 deletions
diff --git a/linden/indra/newview/llpaneldirfind.cpp b/linden/indra/newview/llpaneldirfind.cpp index dca29ae..ee9aa69 100644 --- a/linden/indra/newview/llpaneldirfind.cpp +++ b/linden/indra/newview/llpaneldirfind.cpp | |||
| @@ -63,7 +63,14 @@ | |||
| 63 | #include "llpaneldirbrowser.h" | 63 | #include "llpaneldirbrowser.h" |
| 64 | 64 | ||
| 65 | #include <boost/tokenizer.hpp> | 65 | #include <boost/tokenizer.hpp> |
| 66 | #include <boost/lexical_cast.hpp> | 66 | #if LL_WINDOWS |
| 67 | // Disable warning for unreachable code in boost/lexical_cast.hpp for Boost 1.36 -- McCabe | ||
| 68 | #pragma warning(disable : 4702) | ||
| 69 | #include "boost/lexical_cast.hpp" | ||
| 70 | #pragma warning(default : 4702) | ||
| 71 | #else | ||
| 72 | #include "boost/lexical_cast.hpp" | ||
| 73 | #endif | ||
| 67 | 74 | ||
| 68 | //--------------------------------------------------------------------------- | 75 | //--------------------------------------------------------------------------- |
| 69 | // LLPanelDirFindAll - Google search appliance based search | 76 | // LLPanelDirFindAll - Google search appliance based search |
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp index 1fa7cf0..68c1dc3 100644 --- a/linden/indra/newview/llvoavatar.cpp +++ b/linden/indra/newview/llvoavatar.cpp | |||
| @@ -83,7 +83,14 @@ | |||
| 83 | #include "llvoiceclient.h" | 83 | #include "llvoiceclient.h" |
| 84 | #include "llvoicevisualizer.h" // Ventrella | 84 | #include "llvoicevisualizer.h" // Ventrella |
| 85 | 85 | ||
| 86 | #if LL_WINDOWS | ||
| 87 | // Disable warning for unreachable code in boost/lexical_cast.hpp for Boost 1.36 -- McCabe | ||
| 88 | #pragma warning(disable : 4702) | ||
| 86 | #include "boost/lexical_cast.hpp" | 89 | #include "boost/lexical_cast.hpp" |
| 90 | #pragma warning(default : 4702) | ||
| 91 | #else | ||
| 92 | #include "boost/lexical_cast.hpp" | ||
| 93 | #endif | ||
| 87 | // [RLVa:KB] | 94 | // [RLVa:KB] |
| 88 | #include "llstartup.h" | 95 | #include "llstartup.h" |
| 89 | // [/RLVa:KB] | 96 | // [/RLVa:KB] |