diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-02 15:59:42 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-02 15:59:42 -0400 |
| commit | 0eaca22969fb14402a898325a64276e1c11dff0c (patch) | |
| tree | 73e7c10a205f02d29c084feea047d503cf8ca390 /indra | |
| parent | 44eaaa507cf96c1e456fe48fd6969c6ace66b919 (diff) | |
Try suppressing #include <gmock/gmock.h> (fails on Linux).
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llmessage/tests/llmockhttpclient.h | 2 | ||||
| -rw-r--r-- | indra/test/test.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/tests/llmockhttpclient.h b/indra/llmessage/tests/llmockhttpclient.h index af26bf8803..0afe2d386a 100644 --- a/indra/llmessage/tests/llmockhttpclient.h +++ b/indra/llmessage/tests/llmockhttpclient.h @@ -31,7 +31,7 @@ #include "linden_common.h" #include "llhttpclientinterface.h" -#include <gmock/gmock.h> +//#include <gmock/gmock.h> class LLMockHTTPClient : public LLHTTPClientInterface { diff --git a/indra/test/test.cpp b/indra/test/test.cpp index f1c5991330..88d75989e5 100644 --- a/indra/test/test.cpp +++ b/indra/test/test.cpp @@ -60,7 +60,7 @@ typedef struct { size_t re_nsub; size_t re_erroffset; } regex_t; -#include <gmock/gmock.h> +//#include <gmock/gmock.h> #include <gtest/gtest.h> #endif |