core:ppc Fixed compilation with xlc, clang.
- Use EXPECT_TRUE instead of EXPECT_EQ for comparing NULL in xlc - Added support for int64 to vec_promote in xlc, clang - Fixed v_rotate_right in xlc
This commit is contained in:
@@ -41,6 +41,12 @@
|
||||
|
||||
#include "test_precomp.hpp"
|
||||
|
||||
#ifdef GTEST_CAN_COMPARE_NULL
|
||||
# define EXPECT_NULL(ptr) EXPECT_EQ(NULL, ptr)
|
||||
#else
|
||||
# define EXPECT_NULL(ptr) EXPECT_TRUE(ptr == NULL)
|
||||
#endif
|
||||
|
||||
using namespace cv;
|
||||
|
||||
namespace {
|
||||
@@ -78,7 +84,7 @@ int dummyObject;
|
||||
TEST(Core_Ptr, default_ctor)
|
||||
{
|
||||
Ptr<int> p;
|
||||
EXPECT_EQ(NULL, p.get());
|
||||
EXPECT_NULL(p.get());
|
||||
}
|
||||
|
||||
TEST(Core_Ptr, owning_ctor)
|
||||
@@ -102,7 +108,7 @@ TEST(Core_Ptr, owning_ctor)
|
||||
|
||||
{
|
||||
Ptr<void> p((void*)0, ReportingDeleter(&deleted));
|
||||
EXPECT_EQ(NULL, p.get());
|
||||
EXPECT_NULL(p.get());
|
||||
}
|
||||
|
||||
EXPECT_FALSE(deleted);
|
||||
@@ -187,7 +193,7 @@ TEST(Core_Ptr, release)
|
||||
Ptr<Reporter> p1(new Reporter(&deleted));
|
||||
p1.release();
|
||||
EXPECT_TRUE(deleted);
|
||||
EXPECT_EQ(NULL, p1.get());
|
||||
EXPECT_NULL(p1.get());
|
||||
}
|
||||
|
||||
TEST(Core_Ptr, reset)
|
||||
@@ -253,7 +259,7 @@ TEST(Core_Ptr, accessors)
|
||||
{
|
||||
{
|
||||
Ptr<int> p;
|
||||
EXPECT_EQ(NULL, static_cast<int*>(p));
|
||||
EXPECT_NULL(static_cast<int*>(p));
|
||||
EXPECT_TRUE(p.empty());
|
||||
}
|
||||
|
||||
@@ -327,7 +333,7 @@ TEST(Core_Ptr, casts)
|
||||
{
|
||||
Ptr<Reporter> p1(new Reporter(&deleted));
|
||||
Ptr<SubReporter> p2 = p1.dynamicCast<SubReporter>();
|
||||
EXPECT_EQ(NULL, p2.get());
|
||||
EXPECT_NULL(p2.get());
|
||||
p1.release();
|
||||
EXPECT_FALSE(deleted);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user