From 04291ba319a6e68f2c2e9bd8e299878b93424452 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 22 Oct 2014 16:42:18 -0400
Subject: [PATCH] correct merge error in llerror_test.cpp
---
indra/llcommon/tests/llerror_test.cpp | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp
index 8084a052884..febfa782ca2 100755
--- a/indra/llcommon/tests/llerror_test.cpp
+++ b/indra/llcommon/tests/llerror_test.cpp
@@ -39,6 +39,14 @@
namespace
{
# pragma clang diagnostic ignored "-Wunused-function"
+ void test_that_error_h_includes_enough_things_to_compile_a_message()
+ {
+ LL_INFOS() << "!" << LL_ENDL;
+ }
+}
+
+namespace
+{
static bool fatalWasCalled;
void fatalCall(const std::string&) { fatalWasCalled = true; }
}
--
GitLab