llvm.org GIT mirror llvm / 4c75054
re-apply r80197, now that iterator.h is not mentioned any more git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@80254 91177308-0d34-0410-b5e6-96231b3b80d8 Gabor Greif 11 years ago
7 changed file(s) with 42 addition(s) and 213 deletion(s). Raw diff Collapse all Expand all
116116 dist-hook::
117117 $(Echo) Eliminating files constructed by configure
118118 $(Verb) $(RM) -f \
119 $(TopDistDir)/include/llvm/ADT/iterator.h \
120119 $(TopDistDir)/include/llvm/Config/config.h \
121120 $(TopDistDir)/include/llvm/Support/DataTypes.h \
122121 $(TopDistDir)/include/llvm/Support/ThreadSupport.h
135134 include/llvm/Config/config.h \
136135 include/llvm/Config/Targets.def \
137136 include/llvm/Config/AsmPrinters.def \
138 include/llvm/Support/DataTypes.h \
139 include/llvm/ADT/iterator.h
137 include/llvm/Support/DataTypes.h
140138 FilesToConfigPATH := $(addprefix $(LLVM_OBJ_ROOT)/,$(FilesToConfig))
141139
142140 all-local:: $(FilesToConfigPATH)
13131313 AC_CONFIG_FILES([include/llvm/Config/AsmPrinters.def])
13141314 AC_CONFIG_FILES([include/llvm/Config/AsmParsers.def])
13151315 AC_CONFIG_HEADERS([include/llvm/Support/DataTypes.h])
1316 AC_CONFIG_HEADERS([include/llvm/ADT/iterator.h])
13171316
13181317 dnl Configure the makefile's configuration data
13191318 AC_CONFIG_FILES([Makefile.config])
180180 )
181181
182182 configure_file(
183 ${LLVM_MAIN_INCLUDE_DIR}/llvm/ADT/iterator.cmake
184 ${LLVM_BINARY_DIR}/include/llvm/ADT/iterator.h
185 )
186
187 configure_file(
188183 ${LLVM_MAIN_INCLUDE_DIR}/llvm/Support/DataTypes.h.cmake
189184 ${LLVM_BINARY_DIR}/include/llvm/Support/DataTypes.h
190185 )
833833 ENABLE_OPTIMIZED
834834 ENABLE_PROFILING
835835 DISABLE_ASSERTIONS
836 LLVM_COMPACT_SENTINELS
837836 ENABLE_EXPENSIVE_CHECKS
838837 EXPENSIVE_CHECKS
839838 DEBUG_RUNTIME
48454844
48464845 fi
48474846
4848 if test ${ENABLE_OPTIMIZED},${DISABLE_ASSERTIONS} = "ENABLE_OPTIMIZED=1,DISABLE_ASSERTIONS=1" ; then
4849 LLVM_COMPACT_SENTINELS=1
4850
4851 else
4852 LLVM_COMPACT_SENTINELS=0
4853
4854 fi
4855
4856
4857 cat >>confdefs.h <<_ACEOF
4858 #define LLVM_COMPACT_SENTINELS $LLVM_COMPACT_SENTINELS
4859 _ACEOF
4860
4861
4862
48634847 # Check whether --enable-expensive-checks was given.
48644848 if test "${enable_expensive_checks+set}" = set; then
48654849 enableval=$enable_expensive_checks;
1098710971 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1098810972 lt_status=$lt_dlunknown
1098910973 cat > conftest.$ac_ext <
10990 #line 10991 "configure"
10974 #line 10975 "configure"
1099110975 #include "confdefs.h"
1099210976
1099310977 #if HAVE_DLFCN_H
1313113115 ;;
1313213116 *-*-irix6*)
1313313117 # Find out which ABI we are using.
13134 echo '#line 13135 "configure"' > conftest.$ac_ext
13118 echo '#line 13119 "configure"' > conftest.$ac_ext
1313513119 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
1313613120 (eval $ac_compile) 2>&5
1313713121 ac_status=$?
1484914833 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1485014834 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1485114835 -e 's:$: $lt_compiler_flag:'`
14852 (eval echo "\"\$as_me:14853: $lt_compile\"" >&5)
14836 (eval echo "\"\$as_me:14837: $lt_compile\"" >&5)
1485314837 (eval "$lt_compile" 2>conftest.err)
1485414838 ac_status=$?
1485514839 cat conftest.err >&5
14856 echo "$as_me:14857: \$? = $ac_status" >&5
14840 echo "$as_me:14841: \$? = $ac_status" >&5
1485714841 if (exit $ac_status) && test -s "$ac_outfile"; then
1485814842 # The compiler can only warn and ignore the option if not recognized
1485914843 # So say no if there are warnings other than the usual output.
1511715101 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1511815102 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1511915103 -e 's:$: $lt_compiler_flag:'`
15120 (eval echo "\"\$as_me:15121: $lt_compile\"" >&5)
15104 (eval echo "\"\$as_me:15105: $lt_compile\"" >&5)
1512115105 (eval "$lt_compile" 2>conftest.err)
1512215106 ac_status=$?
1512315107 cat conftest.err >&5
15124 echo "$as_me:15125: \$? = $ac_status" >&5
15108 echo "$as_me:15109: \$? = $ac_status" >&5
1512515109 if (exit $ac_status) && test -s "$ac_outfile"; then
1512615110 # The compiler can only warn and ignore the option if not recognized
1512715111 # So say no if there are warnings other than the usual output.
1522115205 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1522215206 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1522315207 -e 's:$: $lt_compiler_flag:'`
15224 (eval echo "\"\$as_me:15225: $lt_compile\"" >&5)
15208 (eval echo "\"\$as_me:15209: $lt_compile\"" >&5)
1522515209 (eval "$lt_compile" 2>out/conftest.err)
1522615210 ac_status=$?
1522715211 cat out/conftest.err >&5
15228 echo "$as_me:15229: \$? = $ac_status" >&5
15212 echo "$as_me:15213: \$? = $ac_status" >&5
1522915213 if (exit $ac_status) && test -s out/conftest2.$ac_objext
1523015214 then
1523115215 # The compiler can only warn and ignore the option if not recognized
1767317657 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1767417658 lt_status=$lt_dlunknown
1767517659 cat > conftest.$ac_ext <
17676 #line 17677 "configure"
17660 #line 17661 "configure"
1767717661 #include "confdefs.h"
1767817662
1767917663 #if HAVE_DLFCN_H
1777317757 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1777417758 lt_status=$lt_dlunknown
1777517759 cat > conftest.$ac_ext <
17776 #line 17777 "configure"
17760 #line 17761 "configure"
1777717761 #include "confdefs.h"
1777817762
1777917763 #if HAVE_DLFCN_H
2014120125 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
2014220126 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
2014320127 -e 's:$: $lt_compiler_flag:'`
20144 (eval echo "\"\$as_me:20145: $lt_compile\"" >&5)
20128 (eval echo "\"\$as_me:20129: $lt_compile\"" >&5)
2014520129 (eval "$lt_compile" 2>conftest.err)
2014620130 ac_status=$?
2014720131 cat conftest.err >&5
20148 echo "$as_me:20149: \$? = $ac_status" >&5
20132 echo "$as_me:20133: \$? = $ac_status" >&5
2014920133 if (exit $ac_status) && test -s "$ac_outfile"; then
2015020134 # The compiler can only warn and ignore the option if not recognized
2015120135 # So say no if there are warnings other than the usual output.
2024520229 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
2024620230 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
2024720231 -e 's:$: $lt_compiler_flag:'`
20248 (eval echo "\"\$as_me:20249: $lt_compile\"" >&5)
20232 (eval echo "\"\$as_me:20233: $lt_compile\"" >&5)
2024920233 (eval "$lt_compile" 2>out/conftest.err)
2025020234 ac_status=$?
2025120235 cat out/conftest.err >&5
20252 echo "$as_me:20253: \$? = $ac_status" >&5
20236 echo "$as_me:20237: \$? = $ac_status" >&5
2025320237 if (exit $ac_status) && test -s out/conftest2.$ac_objext
2025420238 then
2025520239 # The compiler can only warn and ignore the option if not recognized
2181521799 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
2181621800 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
2181721801 -e 's:$: $lt_compiler_flag:'`
21818 (eval echo "\"\$as_me:21819: $lt_compile\"" >&5)
21802 (eval echo "\"\$as_me:21803: $lt_compile\"" >&5)
2181921803 (eval "$lt_compile" 2>conftest.err)
2182021804 ac_status=$?
2182121805 cat conftest.err >&5
21822 echo "$as_me:21823: \$? = $ac_status" >&5
21806 echo "$as_me:21807: \$? = $ac_status" >&5
2182321807 if (exit $ac_status) && test -s "$ac_outfile"; then
2182421808 # The compiler can only warn and ignore the option if not recognized
2182521809 # So say no if there are warnings other than the usual output.
2191921903 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
2192021904 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
2192121905 -e 's:$: $lt_compiler_flag:'`
21922 (eval echo "\"\$as_me:21923: $lt_compile\"" >&5)
21906 (eval echo "\"\$as_me:21907: $lt_compile\"" >&5)
2192321907 (eval "$lt_compile" 2>out/conftest.err)
2192421908 ac_status=$?
2192521909 cat out/conftest.err >&5
21926 echo "$as_me:21927: \$? = $ac_status" >&5
21910 echo "$as_me:21911: \$? = $ac_status" >&5
2192721911 if (exit $ac_status) && test -s out/conftest2.$ac_objext
2192821912 then
2192921913 # The compiler can only warn and ignore the option if not recognized
2415424138 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
2415524139 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
2415624140 -e 's:$: $lt_compiler_flag:'`
24157 (eval echo "\"\$as_me:24158: $lt_compile\"" >&5)
24141 (eval echo "\"\$as_me:24142: $lt_compile\"" >&5)
2415824142 (eval "$lt_compile" 2>conftest.err)
2415924143 ac_status=$?
2416024144 cat conftest.err >&5
24161 echo "$as_me:24162: \$? = $ac_status" >&5
24145 echo "$as_me:24146: \$? = $ac_status" >&5
2416224146 if (exit $ac_status) && test -s "$ac_outfile"; then
2416324147 # The compiler can only warn and ignore the option if not recognized
2416424148 # So say no if there are warnings other than the usual output.
2442224406 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
2442324407 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
2442424408 -e 's:$: $lt_compiler_flag:'`
24425 (eval echo "\"\$as_me:24426: $lt_compile\"" >&5)
24409 (eval echo "\"\$as_me:24410: $lt_compile\"" >&5)
2442624410 (eval "$lt_compile" 2>conftest.err)
2442724411 ac_status=$?
2442824412 cat conftest.err >&5
24429 echo "$as_me:24430: \$? = $ac_status" >&5
24413 echo "$as_me:24414: \$? = $ac_status" >&5
2443024414 if (exit $ac_status) && test -s "$ac_outfile"; then
2443124415 # The compiler can only warn and ignore the option if not recognized
2443224416 # So say no if there are warnings other than the usual output.
2452624510 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
2452724511 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
2452824512 -e 's:$: $lt_compiler_flag:'`
24529 (eval echo "\"\$as_me:24530: $lt_compile\"" >&5)
24513 (eval echo "\"\$as_me:24514: $lt_compile\"" >&5)
2453024514 (eval "$lt_compile" 2>out/conftest.err)
2453124515 ac_status=$?
2453224516 cat out/conftest.err >&5
24533 echo "$as_me:24534: \$? = $ac_status" >&5
24517 echo "$as_me:24518: \$? = $ac_status" >&5
2453424518 if (exit $ac_status) && test -s out/conftest2.$ac_objext
2453524519 then
2453624520 # The compiler can only warn and ignore the option if not recognized
3531535299
3531635300 ac_config_headers="$ac_config_headers include/llvm/Support/DataTypes.h"
3531735301
35318 ac_config_headers="$ac_config_headers include/llvm/ADT/iterator.h"
35319
3532035302
3532135303 ac_config_files="$ac_config_files Makefile.config"
3532235304
3594335925 "include/llvm/Config/AsmPrinters.def") CONFIG_FILES="$CONFIG_FILES include/llvm/Config/AsmPrinters.def" ;;
3594435926 "include/llvm/Config/AsmParsers.def") CONFIG_FILES="$CONFIG_FILES include/llvm/Config/AsmParsers.def" ;;
3594535927 "include/llvm/Support/DataTypes.h") CONFIG_HEADERS="$CONFIG_HEADERS include/llvm/Support/DataTypes.h" ;;
35946 "include/llvm/ADT/iterator.h") CONFIG_HEADERS="$CONFIG_HEADERS include/llvm/ADT/iterator.h" ;;
3594735928 "Makefile.config") CONFIG_FILES="$CONFIG_FILES Makefile.config" ;;
3594835929 "llvm.spec") CONFIG_FILES="$CONFIG_FILES llvm.spec" ;;
3594935930 "docs/doxygen.cfg") CONFIG_FILES="$CONFIG_FILES docs/doxygen.cfg" ;;
3610336084 ENABLE_OPTIMIZED!$ENABLE_OPTIMIZED$ac_delim
3610436085 ENABLE_PROFILING!$ENABLE_PROFILING$ac_delim
3610536086 DISABLE_ASSERTIONS!$DISABLE_ASSERTIONS$ac_delim
36106 LLVM_COMPACT_SENTINELS!$LLVM_COMPACT_SENTINELS$ac_delim
3610736087 ENABLE_EXPENSIVE_CHECKS!$ENABLE_EXPENSIVE_CHECKS$ac_delim
3610836088 EXPENSIVE_CHECKS!$EXPENSIVE_CHECKS$ac_delim
3610936089 DEBUG_RUNTIME!$DEBUG_RUNTIME$ac_delim
3612236102 ENABLE_LLVMC_DYNAMIC!$ENABLE_LLVMC_DYNAMIC$ac_delim
3612336103 ENABLE_LLVMC_DYNAMIC_PLUGINS!$ENABLE_LLVMC_DYNAMIC_PLUGINS$ac_delim
3612436104 CXX!$CXX$ac_delim
36105 CXXFLAGS!$CXXFLAGS$ac_delim
3612536106 _ACEOF
3612636107
3612736108 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
3616336144 ac_delim='%!_!# '
3616436145 for ac_last_try in false false false false false :; do
3616536146 cat >conf$$subs.sed <<_ACEOF
36166 CXXFLAGS!$CXXFLAGS$ac_delim
3616736147 ac_ct_CXX!$ac_ct_CXX$ac_delim
3616836148 NM!$NM$ac_delim
3616936149 ifGNUmake!$ifGNUmake$ac_delim
3625736237 LTLIBOBJS!$LTLIBOBJS$ac_delim
3625836238 _ACEOF
3625936239
36260 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then
36240 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then
3626136241 break
3626236242 elif $ac_last_try; then
3626336243 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+0
-79
include/llvm/ADT/iterator.cmake less more
None //===-- llvm/ADT/iterator - Portable wrapper around --*- C++ -*-===//
1 //
2 // The LLVM Compiler Infrastructure
3 //
4 // This file was developed by the LLVM research group and is distributed under
5 // the University of Illinois Open Source License. See LICENSE.TXT for details.
6 //
7 //===----------------------------------------------------------------------===//
8 //
9 // This file provides a wrapper around the mysterious header file.
10 // In GCC 2.95.3, the file defines a bidirectional_iterator class (and other
11 // friends), instead of the standard iterator class. In GCC 3.1, the
12 // bidirectional_iterator class got moved out and the new, standards compliant,
13 // iterator<> class was added. Because there is nothing that we can do to get
14 // correct behavior on both compilers, we have this header with #ifdef's. Gross
15 // huh?
16 //
17 // By #includ'ing this file, you get the contents of plus the
18 // following classes in the global namespace:
19 //
20 // 1. bidirectional_iterator
21 // 2. forward_iterator
22 //
23 // The #if directives' expressions are filled in by Autoconf.
24 //
25 //===----------------------------------------------------------------------===//
26
27 #ifndef LLVM_ADT_ITERATOR
28 #define LLVM_ADT_ITERATOR
29
30 #include
31
32 #undef HAVE_BI_ITERATOR
33 #undef HAVE_STD_ITERATOR
34 #undef HAVE_FWD_ITERATOR
35
36 // defined by Kevin
37 #define HAVE_STD_ITERATOR 1
38
39 #ifdef _MSC_VER
40 # define HAVE_BI_ITERATOR 0
41 # define HAVE_STD_ITERATOR 1
42 # define HAVE_FWD_ITERATOR 0
43 #endif
44
45 #if !HAVE_BI_ITERATOR
46 # if HAVE_STD_ITERATOR
47 /// If the bidirectional iterator is not defined, we attempt to define it in
48 /// terms of the C++ standard iterator. Otherwise, we import it with a "using"
49 /// statement.
50 ///
51 template
52 struct bidirectional_iterator
53 : public std::iterator {
54 };
55 # else
56 # error "Need to have standard iterator to define bidirectional iterator!"
57 # endif
58 #else
59 using std::bidirectional_iterator;
60 #endif
61
62 #if !HAVE_FWD_ITERATOR
63 # if HAVE_STD_ITERATOR
64 /// If the forward iterator is not defined, attempt to define it in terms of
65 /// the C++ standard iterator. Otherwise, we import it with a "using" statement.
66 ///
67 template
68 struct forward_iterator
69 : public std::iterator {
70 };
71 # else
72 # error "Need to have standard iterator to define forward iterator!"
73 # endif
74 #else
75 using std::forward_iterator;
76 #endif
77
78 #endif
+0
-76
include/llvm/ADT/iterator.h.in less more
None //==-- llvm/ADT/iterator.h - Portable wrapper around --*- C++ -*-==//
1 //
2 // The LLVM Compiler Infrastructure
3 //
4 // This file is distributed under the University of Illinois Open Source
5 // License. See LICENSE.TXT for details.
6 //
7 //===----------------------------------------------------------------------===//
8 //
9 // This file provides a wrapper around the mysterious header file.
10 // In GCC 2.95.3, the file defines a bidirectional_iterator class (and other
11 // friends), instead of the standard iterator class. In GCC 3.1, the
12 // bidirectional_iterator class got moved out and the new, standards compliant,
13 // iterator<> class was added. Because there is nothing that we can do to get
14 // correct behavior on both compilers, we have this header with #ifdef's. Gross
15 // huh?
16 //
17 // By #includ'ing this file, you get the contents of plus the
18 // following classes in the global namespace:
19 //
20 // 1. bidirectional_iterator
21 // 2. forward_iterator
22 //
23 // The #if directives' expressions are filled in by Autoconf.
24 //
25 //===----------------------------------------------------------------------===//
26
27 #ifndef LLVM_ADT_ITERATOR_H
28 #define LLVM_ADT_ITERATOR_H
29
30 #include
31
32 #undef HAVE_BI_ITERATOR
33 #undef HAVE_STD_ITERATOR
34 #undef HAVE_FWD_ITERATOR
35
36 #ifdef _MSC_VER
37 # define HAVE_BI_ITERATOR 0
38 # define HAVE_STD_ITERATOR 1
39 # define HAVE_FWD_ITERATOR 0
40 #endif
41
42 #if !HAVE_BI_ITERATOR
43 # if HAVE_STD_ITERATOR
44 /// If the bidirectional iterator is not defined, we attempt to define it in
45 /// terms of the C++ standard iterator. Otherwise, we import it with a "using"
46 /// statement.
47 ///
48 template
49 struct bidirectional_iterator
50 : public std::iterator {
51 };
52 # else
53 # error "Need to have standard iterator to define bidirectional iterator!"
54 # endif
55 #else
56 using std::bidirectional_iterator;
57 #endif
58
59 #if !HAVE_FWD_ITERATOR
60 # if HAVE_STD_ITERATOR
61 /// If the forward iterator is not defined, attempt to define it in terms of
62 /// the C++ standard iterator. Otherwise, we import it with a "using" statement.
63 ///
64 template
65 struct forward_iterator
66 : public std::iterator {
67 };
68 # else
69 # error "Need to have standard iterator to define forward iterator!"
70 # endif
71 #else
72 using std::forward_iterator;
73 #endif
74
75 #endif // LLVM_ADT_ITERATOR_H
22 /* Define if dlopen(0) will open the symbols of the program */
33 #undef CAN_DLOPEN_SELF
44
5 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
6 systems. This function is required for `alloca.c' support on those systems.
7 */
8 #undef CRAY_STACKSEG_END
9
10 /* Define to 1 if using `alloca.c'. */
11 #undef C_ALLOCA
12
513 /* Define if CBE is enabled for printf %a output */
614 #undef ENABLE_CBE_PRINTF_A
715
1018
1119 /* Define if threads enabled */
1220 #undef ENABLE_THREADS
21
22 /* Define to 1 if you have `alloca', as a function or macro. */
23 #undef HAVE_ALLOCA
24
25 /* Define to 1 if you have and it should be used (not on Ultrix).
26 */
27 #undef HAVE_ALLOCA_H
1328
1429 /* Define to 1 if you have the `argz_append' function. */
1530 #undef HAVE_ARGZ_APPEND
444459
445460 /* Installation directory for binary executables */
446461 #undef LLVM_BINDIR
447
448 /* Define to 1 for ilist sentinel compaction */
449 #undef LLVM_COMPACT_SENTINELS
450462
451463 /* Time at which LLVM was configured */
452464 #undef LLVM_CONFIGTIME