From 1f58cd688f44fed6da91af5cac0d48166c2647d0 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 14 Jul 2011 20:20:35 -0400
Subject: [PATCH] Pacify Linux gcc more thoroughly.
---
indra/llcommon/tests/llsdserialize_test.cpp | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index 025870c9150..41d2fcc696b 100644
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -157,8 +157,12 @@ class NamedTempScript
// loop back to try another filename
}
// File is open, its name is in mPath: write it and close it.
- (void)_write(fd, content.c_str(), content.length());
- (void)_write(fd, "\n", 1);
+ // Truthfully, we'd just as soon ignore the return value from
+ // _write(), but Linux gcc generates fatal warnings if we do.
+ bool ok(true);
+ ok = ok && (content.length() == _write(fd, content.c_str(), content.length()));
+ ok = ok && (1 == _write(fd, "\n", 1));
+ assert(ok);
_close(fd);
}
--
GitLab