[test-suite] r176194 - Attempt to fix a buildbot that is using libc++ by default. <rdar://13302264>
David Blaikie
dblaikie at gmail.com
Wed Feb 27 10:36:34 PST 2013
On Wed, Feb 27, 2013 at 10:28 AM, Bob Wilson <bob.wilson at apple.com> wrote:
> Author: bwilson
> Date: Wed Feb 27 12:28:28 2013
> New Revision: 176194
>
> URL: http://llvm.org/viewvc/llvm-project?rev=176194&view=rev
> Log:
> Attempt to fix a buildbot that is using libc++ by default. <rdar://13302264>
>
> Modified:
> test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/main.cpp
> test-suite/trunk/SingleSource/Benchmarks/Adobe-C++/stepanov_abstraction.cpp
> test-suite/trunk/SingleSource/Benchmarks/Adobe-C++/stepanov_vector.cpp
> test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/hash.cpp
> test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/hash2.cpp
> test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/lists.cpp
> test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/lists1.cpp
> test-suite/trunk/SingleSource/UnitTests/ObjC++/property-reference.mm
>
> Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/main.cpp
> URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C%2B%2B/city/main.cpp?rev=176194&r1=176193&r2=176194&view=diff
> ==============================================================================
> --- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/main.cpp (original)
> +++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/main.cpp Wed Feb 27 12:28:28 2013
> @@ -50,8 +50,8 @@ int main()
> sprintf(buff, "L%d", i);
> r4 = new roadlet(buff);
>
> - connect(r1, N, r2, S, &is_empty);
> - connect(r3, N, r4, S, &is_empty);
> + connect(r1, N, r2, S, &::is_empty);
> + connect(r3, N, r4, S, &::is_empty);
Is this working around bugs (or at least something that's going to be
so problematic with compatibility that we should treat it as a bug) in
libc++ or just non-portable code?
> connect(r1, NW, r4, SE, &lane_switch_ok);
> connect(r3, NE, r2, SW, &lane_switch_ok);
> connect(r2, W, r4, E, return_null); // can't more sideways
>
> Modified: test-suite/trunk/SingleSource/Benchmarks/Adobe-C++/stepanov_abstraction.cpp
> URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Adobe-C%2B%2B/stepanov_abstraction.cpp?rev=176194&r1=176193&r2=176194&view=diff
> ==============================================================================
> --- test-suite/trunk/SingleSource/Benchmarks/Adobe-C++/stepanov_abstraction.cpp (original)
> +++ test-suite/trunk/SingleSource/Benchmarks/Adobe-C++/stepanov_abstraction.cpp Wed Feb 27 12:28:28 2013
> @@ -189,7 +189,7 @@ inline void check_sum(double result) {
>
> template <typename Iterator>
> void verify_sorted(Iterator first, Iterator last) {
> - if (!is_sorted(first,last))
> + if (!::is_sorted(first,last))
> printf("sort test %i failed\n", current_test);
> }
>
>
> Modified: test-suite/trunk/SingleSource/Benchmarks/Adobe-C++/stepanov_vector.cpp
> URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Adobe-C%2B%2B/stepanov_vector.cpp?rev=176194&r1=176193&r2=176194&view=diff
> ==============================================================================
> --- test-suite/trunk/SingleSource/Benchmarks/Adobe-C++/stepanov_vector.cpp (original)
> +++ test-suite/trunk/SingleSource/Benchmarks/Adobe-C++/stepanov_vector.cpp Wed Feb 27 12:28:28 2013
> @@ -60,7 +60,7 @@ inline void check_sum(double result) {
>
> template <typename Iterator>
> void verify_sorted(Iterator first, Iterator last) {
> - if (!is_sorted(first,last))
> + if (!::is_sorted(first,last))
> printf("sort test %i failed\n", current_test);
> }
>
>
> Modified: test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/hash.cpp
> URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Shootout-C%2B%2B/hash.cpp?rev=176194&r1=176193&r2=176194&view=diff
> ==============================================================================
> --- test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/hash.cpp (original)
> +++ test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/hash.cpp Wed Feb 27 12:28:28 2013
> @@ -25,7 +25,7 @@ main(int argc, char *argv[]) {
> #endif
> int n = ((argc == 2) ? atoi(argv[1]) : LENGTH);
> char buf[16];
> - typedef hash_map<const char*, int, hash<const char*>, eqstr> HM;
> + typedef __gnu_cxx::hash_map<const char*, int, hash<const char*>, eqstr> HM;
> HM X;
>
> for (int i=1; i<=n; i++) {
>
> Modified: test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/hash2.cpp
> URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Shootout-C%2B%2B/hash2.cpp?rev=176194&r1=176193&r2=176194&view=diff
> ==============================================================================
> --- test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/hash2.cpp (original)
> +++ test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/hash2.cpp Wed Feb 27 12:28:28 2013
> @@ -25,7 +25,7 @@ main(int argc, char *argv[]) {
> #endif
> int n = ((argc == 2) ? atoi(argv[1]) : LENGTH);
> char buf[16];
> - typedef hash_map<const char*, int, hash<const char*>, eqstr> HM;
> + typedef __gnu_cxx::hash_map<const char*, int, hash<const char*>, eqstr> HM;
> HM hash1, hash2;
>
> for (int i=0; i<10000; i++) {
>
> Modified: test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/lists.cpp
> URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Shootout-C%2B%2B/lists.cpp?rev=176194&r1=176193&r2=176194&view=diff
> ==============================================================================
> --- test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/lists.cpp (original)
> +++ test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/lists.cpp Wed Feb 27 12:28:28 2013
> @@ -27,7 +27,7 @@ iota(_ForwardIterator __first, _ForwardI
> size_t test_lists() {
> std::list<size_t> li1(SIZE);
>
> - iota(li1.begin(), li1.end(), 1);
> + ::iota(li1.begin(), li1.end(), 1);
>
> std::list<size_t> li2(li1);
>
>
> Modified: test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/lists1.cpp
> URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Shootout-C%2B%2B/lists1.cpp?rev=176194&r1=176193&r2=176194&view=diff
> ==============================================================================
> --- test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/lists1.cpp (original)
> +++ test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/lists1.cpp Wed Feb 27 12:28:28 2013
> @@ -42,7 +42,7 @@ int main(int argc, char* argv[]) {
>
> // create list (A) of integers from 1 through N
> list<int> A(N);
> - iota(A.begin(), A.end(), 1);
> + ::iota(A.begin(), A.end(), 1);
>
> // move each individual item from A to B, in a loop, reversing order
> while (! A.empty()) {
>
> Modified: test-suite/trunk/SingleSource/UnitTests/ObjC++/property-reference.mm
> URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/ObjC%2B%2B/property-reference.mm?rev=176194&r1=176193&r2=176194&view=diff
> ==============================================================================
> --- test-suite/trunk/SingleSource/UnitTests/ObjC++/property-reference.mm (original)
> +++ test-suite/trunk/SingleSource/UnitTests/ObjC++/property-reference.mm Wed Feb 27 12:28:28 2013
> @@ -1,5 +1,10 @@
> #import <Foundation/Foundation.h>
> +#include <ciso646>
> +#ifdef _LIBCPP_VERSION
> +#import <memory>
> +#else
> #import <tr1/memory>
> +#endif
> // rdar: //7501812
>
> class Value
> @@ -13,7 +18,11 @@ private:
> int m_amount;
> };
>
> +#ifdef _LIBCPP_VERSION
> +typedef std::shared_ptr<Value> ValuePtr;
> +#else
> typedef std::tr1::shared_ptr<Value> ValuePtr;
> +#endif
>
> @interface ValueUser : NSObject
> {
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
More information about the llvm-commits
mailing list