diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2011-02-01 17:35:42 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2011-02-01 17:35:42 -0500 |
| commit | 409c59b70d2d4f2958ccd3ee8db5f7e6e08fe14e (patch) | |
| tree | e992ff246e94add17d61dde74dda7a64e2ca7e77 | |
| parent | 66083f9e7a65367fad5bf17dec9a89f9b14c5985 (diff) | |
Fix string-init compile error (g++ 4.4) in llurlentry_stub.cpp.
Newer C++ compilers produce a (fatal) warning when you try to initialize a
(non-const) char* variable with a string literal: you're supposed to capture
such data in a const char*. But as this module is resolving external
references declared in ancient message-system headers, we don't have the
option to fix the original declaration. Instead use
char* _PREHASH_Foo = const_cast<char*>("string literal"); // sigh
| -rw-r--r-- | indra/llui/tests/llurlentry_stub.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/tests/llurlentry_stub.cpp b/indra/llui/tests/llurlentry_stub.cpp index 96ebe83826..c11ad11de9 100644 --- a/indra/llui/tests/llurlentry_stub.cpp +++ b/indra/llui/tests/llurlentry_stub.cpp @@ -193,8 +193,8 @@ LLFontGL* LLFontGL::getFontDefault() return NULL; } -char* _PREHASH_AgentData = "AgentData"; -char* _PREHASH_AgentID = "AgentID"; +char* _PREHASH_AgentData = const_cast<char*>("AgentData"); +char* _PREHASH_AgentID = const_cast<char*>("AgentID"); LLHost LLHost::invalid(INVALID_PORT,INVALID_HOST_IP_ADDRESS); |