feedc0de/boost_regex
1
0
Fork 0
forked from boostorg/regex
Code Pull Requests Activity

Moved static stables into the function bodies to fix a gcc on MacOS X and IMB compiler bug.

Browse Source 
Fixed config system for dll builds - the default linkage option is now static linking.
Fixed makefiles - dll builds now work.
Added Misc fixes for the example programs.


[SVN r19044]
This commit is contained in:
John Maddock
2003-07-11 11:51:35 +00:00
parent c32c644a38
commit cb9409160a
30 changed files with 1064 additions and 920 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
test/pathology/concept_check.cpp
View File

@ -1,11 +1,29 @@
/*
*
* Copyright (c) 2003
* Dr John Maddock
*
* Permission to use, copy, modify, distribute and sell this software
* and its documentation for any purpose is hereby granted without fee,
* provided that the above copyright notice appear in all copies and
* that both that copyright notice and this permission notice appear
* in supporting documentation. Dr John Maddock makes no representations
* about the suitability of this software for any purpose.
* It is provided "as is" without express or implied warranty.
*
*/
#include <boost/regex.hpp>
#include <boost/concept_archetype.hpp>
#include <boost/concept_check.hpp>
#include <boost/detail/workaround.hpp>
int main()
{
// VC6 and VC7 can't cope with the iterator architypes,
// don't bother testing as it doesn't work:
#if !BOOST_WORKAROUND(BOOST_MSVC, < 1310)
typedef boost::bidirectional_iterator_archetype<char> iterator_type;
boost::regex r;
iterator_type a, b;
@ -29,10 +47,15 @@ int main()
boost::regex_iterator<iterator_type>
>
>();
// this fails with glibc++v2 :
#if !BOOST_WORKAROUND(__GNUC__, < 3) && !BOOST_WORKAROUND(BOOST_MSVC, <1300)
boost::function_requires<
boost::ForwardIteratorConcept<
boost::regex_token_iterator<iterator_type>
>
>();
#endif
#endif
return 0;
}

25
test/regress/vc71.mak
View File

@ -116,22 +116,22 @@ r6m.exe : $(SOURCES)
r1l.exe : $(SOURCES)
cl /MD /D_MT /D_DLL $(CFLAGS) -o r1l.exe -DBOOST_REGEX_DYN_LIB -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES) $(LFLAGS)
cl /MD /D_MT /D_DLL $(CFLAGS) -o r1l.exe -DBOOST_REGEX_DYN_LINK -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES) $(LFLAGS)
r2l.exe : $(SOURCES)
cl /MD /D_MT /D_DLL $(CFLAGS) -o r2l.exe -DBOOST_REGEX_DYN_LIB -DBOOST_RE_TEST_LOCALE_C $(SOURCES) $(LFLAGS)
cl /MD /D_MT /D_DLL $(CFLAGS) -o r2l.exe -DBOOST_REGEX_DYN_LINK -DBOOST_RE_TEST_LOCALE_C $(SOURCES) $(LFLAGS)
r3l.exe : $(SOURCES)
cl /MD /D_MT /D_DLL $(CFLAGS) -o r3l.exe -DBOOST_REGEX_DYN_LIB -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES) $(LFLAGS)
cl /MD /D_MT /D_DLL $(CFLAGS) -o r3l.exe -DBOOST_REGEX_DYN_LINK -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES) $(LFLAGS)
r4l.exe : $(SOURCES)
cl /MD /D_MT /D_DLL $(CFLAGS) -o r4l.exe -DBOOST_REGEX_DYN_LIB -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES) $(LFLAGS)
cl /MD /D_MT /D_DLL $(CFLAGS) -o r4l.exe -DBOOST_REGEX_DYN_LINK -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES) $(LFLAGS)
r5l.exe : $(SOURCES)
cl /MD /D_MT /D_DLL $(CFLAGS) -o r5l.exe -DBOOST_REGEX_DYN_LIB -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES) $(LFLAGS)
cl /MD /D_MT /D_DLL $(CFLAGS) -o r5l.exe -DBOOST_REGEX_DYN_LINK -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES) $(LFLAGS)
r6l.exe : $(SOURCES)
cl /MD /D_MT /D_DLL $(CFLAGS) -o r6l.exe -DBOOST_REGEX_DYN_LIB -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES) $(LFLAGS)
cl /MD /D_MT /D_DLL $(CFLAGS) -o r6l.exe -DBOOST_REGEX_DYN_LINK -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES) $(LFLAGS)
r1ls.exe : $(SOURCES)
@ -191,22 +191,23 @@ r6md.exe : $(SOURCES)
r1lmd.exe : $(SOURCES)
cl /MDd /D_MT /D_DLL $(CFLAGS) -o r1lmd.exe -DBOOST_REGEX_DYN_LIB -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES) $(LFLAGS)
cl /MDd /D_MT /D_DLL $(CFLAGS) -o r1lmd.exe -DBOOST_REGEX_DYN_LINK -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES) $(LFLAGS)
r2lmd.exe : $(SOURCES)
cl /MDd /D_MT /D_DLL $(CFLAGS) -o r2lmd.exe -DBOOST_REGEX_DYN_LIB -DBOOST_RE_TEST_LOCALE_C $(SOURCES) $(LFLAGS)
cl /MDd /D_MT /D_DLL $(CFLAGS) -o r2lmd.exe -DBOOST_REGEX_DYN_LINK -DBOOST_RE_TEST_LOCALE_C $(SOURCES) $(LFLAGS)
r3lmd.exe : $(SOURCES)
cl /MDd /D_MT /D_DLL $(CFLAGS) -o r3lmd.exe -DBOOST_REGEX_DYN_LIB -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES) $(LFLAGS)
cl /MDd /D_MT /D_DLL $(CFLAGS) -o r3lmd.exe -DBOOST_REGEX_DYN_LINK -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES) $(LFLAGS)
r4lmd.exe : $(SOURCES)
cl /MDd /D_MT /D_DLL $(CFLAGS) -o r4lmd.exe -DBOOST_REGEX_DYN_LIB -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES) $(LFLAGS)
cl /MDd /D_MT /D_DLL $(CFLAGS) -o r4lmd.exe -DBOOST_REGEX_DYN_LINK -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES) $(LFLAGS)
r5lmd.exe : $(SOURCES)
cl /MDd /D_MT /D_DLL $(CFLAGS) -o r5lmd.exe -DBOOST_REGEX_DYN_LIB -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES) $(LFLAGS)
cl /MDd /D_MT /D_DLL $(CFLAGS) -o r5lmd.exe -DBOOST_REGEX_DYN_LINK -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES) $(LFLAGS)
r6lmd.exe : $(SOURCES)
cl /MDd /D_MT /D_DLL $(CFLAGS) -o r6lmd.exe -DBOOST_REGEX_DYN_LIB -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES) $(LFLAGS)
cl /MDd /D_MT /D_DLL $(CFLAGS) -o r6lmd.exe -DBOOST_REGEX_DYN_LINK -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES) $(LFLAGS)