From 2e968dea9c1734f2fc268445aff83d4de285c9b5 Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Sun, 8 Aug 2004 09:48:10 +0000
Subject: [PATCH] Minor workarounds for SGI and Darwin platforms.

[SVN r24340]
---
 test/c_compiler_checks/wide_posix_api_check.c   | 2 +-
 test/c_compiler_checks/wide_posix_api_check.cpp | 2 +-
 test/captures/captures_test.cpp                 | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/test/c_compiler_checks/wide_posix_api_check.c b/test/c_compiler_checks/wide_posix_api_check.c
index e1e5df91..893a65e1 100644
--- a/test/c_compiler_checks/wide_posix_api_check.c
+++ b/test/c_compiler_checks/wide_posix_api_check.c
@@ -23,11 +23,11 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
-#include <wchar.h>
 #include <stdlib.h>
 #include <boost/regex.h>
 
 #ifndef BOOST_NO_WREGEX
+#include <wchar.h>
 
 const wchar_t* expression = L"^";
 const wchar_t* text = L"\n      ";
diff --git a/test/c_compiler_checks/wide_posix_api_check.cpp b/test/c_compiler_checks/wide_posix_api_check.cpp
index ad898d28..c38cbc66 100644
--- a/test/c_compiler_checks/wide_posix_api_check.cpp
+++ b/test/c_compiler_checks/wide_posix_api_check.cpp
@@ -23,9 +23,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
-#include <wchar.h>
 #include <stdlib.h>
 #include <boost/regex.h>
+#include <wchar.h>
 
 #ifndef BOOST_NO_WREGEX
 
diff --git a/test/captures/captures_test.cpp b/test/captures/captures_test.cpp
index 39e96e66..8f389e40 100644
--- a/test/captures/captures_test.cpp
+++ b/test/captures/captures_test.cpp
@@ -22,8 +22,13 @@
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
 
+#ifdef __sgi
+template <class T>
+void test_captures(const std::string& regx, const std::string& text, const T& expected)
+#else
 template <class T>
 void test_captures(const std::string& regx, const std::string& text, T& expected)
+#endif
 {
    boost::regex e(regx);
    boost::smatch what;