Fixed most of the compiler specific issues in the last commit.

[SVN r23041]
This commit is contained in:
John Maddock committed 2004-06-07 12:50:39 +00:00
1 parent fce31e9800
commit 1d5a14164a
23 files changed
+903 -55

No files matched your search

+7 -13
View File
@@ -18,15 +18,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <boost/regex.hpp>
#ifdef JM_OLD_IOSTREAM
#include <iostream.h>
#else
#include <iostream>
using std::cout;
using std::cin;
using std::cerr;
using std::endl;
#endif
using namespace std;
#ifdef __BORLANDC__
# pragma hrdstop
#endif
@@ -38,12 +31,13 @@ using std::endl;
#endif
#include "jgrep.h"
#ifndef BOOST_REGEX_NO_FILEITER
#ifndef JM_ALGO_INCLUDED
// HP and SGI STL's use <algo.h> instead
// this will have been pulled in by <jm_cfg.h>
// for std::distance
#include <algorithm>
#ifdef BOOST_NO_STDC_NAMESPACE
namespace std{
using ::strcpy; using ::strcat;
using ::sprintf;
}
#endif
re_type e;
-1
View File
@@ -39,7 +39,6 @@ using std::getline;
#if defined(_WIN32) && defined(BOOST_REGEX_USE_WIN32_LOCALE)
#include <windows.h>
#pragma comment(lib, "user32.lib")
#endif
#if (defined(_MSC_VER) && (_MSC_VER <= 1300)) || defined(__sgi)