diff options
| -rw-r--r-- | indra/llimage/tests/llimageworker_test.cpp | 3 | ||||
| -rw-r--r-- | indra/test/test.cpp | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/indra/llimage/tests/llimageworker_test.cpp b/indra/llimage/tests/llimageworker_test.cpp index 49fc1afd82..2568adf89e 100644 --- a/indra/llimage/tests/llimageworker_test.cpp +++ b/indra/llimage/tests/llimageworker_test.cpp @@ -68,6 +68,7 @@ U8* LLImageRaw::allocateData(S32 size) { return NULL; } U8* LLImageRaw::reallocateData(S32 size) { return NULL; } const U8* LLImageBase::getData() const { return NULL; } U8* LLImageBase::getData() { return NULL; } +const std::string& LLImage::getLastThreadError() { static std::string msg; return msg; } // End Stubbing // ------------------------------------------------------------------------------------------- @@ -98,7 +99,7 @@ namespace tut done = res; *done = false; } - virtual void completed(bool success, LLImageRaw* raw, LLImageRaw* aux, U32) + virtual void completed(bool success, const std::string& error_message, LLImageRaw* raw, LLImageRaw* aux, U32 request_id) { *done = true; } diff --git a/indra/test/test.cpp b/indra/test/test.cpp index 21232e88f5..61a4eb07c5 100644 --- a/indra/test/test.cpp +++ b/indra/test/test.cpp @@ -54,12 +54,6 @@ #endif #ifndef LL_WINDOWS - -typedef struct { - void *re_pcre; - size_t re_nsub; - size_t re_erroffset; -} regex_t; #include <gmock/gmock.h> #include <gtest/gtest.h> #endif |