diff options
author | Roman Lebedev <lebedev.ri@gmail.com> | 2018-08-31 08:59:15 +0000 |
---|---|---|
committer | Roman Lebedev <lebedev.ri@gmail.com> | 2018-08-31 08:59:15 +0000 |
commit | a8c22c0894ffc5719bce53dc4938054722bfcf66 (patch) | |
tree | 3d57aa07e2dbf6876a273cd147a98c8799ae57f1 /llvm/unittests/XRay/FDRProducerConsumerTest.cpp | |
parent | 75c2961b764bcd54a1563a9a4f5cf3da66e815da (diff) | |
download | bcm5719-llvm-a8c22c0894ffc5719bce53dc4938054722bfcf66.tar.gz bcm5719-llvm-a8c22c0894ffc5719bce53dc4938054722bfcf66.zip |
[XRay] FDRProducerConsumerTest: unbreak (gcc?) build
/build/llvm/unittests/XRay/FDRProducerConsumerTest.cpp:90:27: error: declaration of ‘std::unique_ptr<llvm::xray::Record> llvm::xray::{anonymous}::RoundTripTest<T>::Record’ [-fpermissive]
std::unique_ptr<Record> Record;
^~~~~~
In file included from /build/llvm/include/llvm/XRay/FDRLogBuilder.h:12,
from /build/llvm/unittests/XRay/FDRProducerConsumerTest.cpp:15:
/build/llvm/include/llvm/XRay/FDRRecords.h:28:7: error: changes meaning of ‘Record’ from ‘class llvm::xray::Record’ [-fpermissive]
class Record {
^~~~~~
llvm-svn: 341189
Diffstat (limited to 'llvm/unittests/XRay/FDRProducerConsumerTest.cpp')
-rw-r--r-- | llvm/unittests/XRay/FDRProducerConsumerTest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/unittests/XRay/FDRProducerConsumerTest.cpp b/llvm/unittests/XRay/FDRProducerConsumerTest.cpp index 6f2aebe1f06..8d6f0d95515 100644 --- a/llvm/unittests/XRay/FDRProducerConsumerTest.cpp +++ b/llvm/unittests/XRay/FDRProducerConsumerTest.cpp @@ -79,7 +79,7 @@ public: H.CycleFrequency = 3e9; Writer = make_unique<FDRTraceWriter>(OS, H); - Record = MakeRecord<T>(); + Rec = MakeRecord<T>(); } protected: @@ -87,7 +87,7 @@ protected: raw_string_ostream OS; XRayFileHeader H; std::unique_ptr<FDRTraceWriter> Writer; - std::unique_ptr<Record> Record; + std::unique_ptr<Record> Rec; }; TYPED_TEST_CASE_P(RoundTripTest); @@ -95,7 +95,7 @@ TYPED_TEST_CASE_P(RoundTripTest); // This test ensures that the writing and reading implementations are in sync -- // that given write(read(write(R))) == R. TYPED_TEST_P(RoundTripTest, RoundTripsSingleValue) { - auto &R = this->Record; + auto &R = this->Rec; ASSERT_FALSE(errorToBool(R->apply(*this->Writer))); this->OS.flush(); |