summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2011-07-14 20:20:35 -0400
committerNat Goodspeed <nat@lindenlab.com>2011-07-14 20:20:35 -0400
commit1f58cd688f44fed6da91af5cac0d48166c2647d0 (patch)
tree55078e83b7dc5f0fa2b71888ddbf5e17684cc867
parent9f66409b88481ca4ded5b9bb9d81e5977a43a5af (diff)
Pacify Linux gcc more thoroughly.
-rw-r--r--indra/llcommon/tests/llsdserialize_test.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index 025870c915..41d2fcc696 100644
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -157,8 +157,12 @@ public:
// 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);
}