Skip to content

Commit c85b0c7

Browse files
committed
Maya 2016 compile fixes for gcc 4.8
1 parent 3d4aff4 commit c85b0c7

File tree

7 files changed

+14
-15
lines changed

7 files changed

+14
-15
lines changed

src/IECoreMaya/FromMayaImageConverter.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//////////////////////////////////////////////////////////////////////////
22
//
3-
// Copyright (c) 2009-2010, Image Engine Design Inc. All rights reserved.
3+
// Copyright (c) 2009-2015, Image Engine Design Inc. All rights reserved.
44
//
55
// Redistribution and use in source and binary forms, with or without
66
// modification, are permitted provided that the following conditions are
@@ -86,7 +86,7 @@ void FromMayaImageConverter::writeChannels( ImagePrimitivePtr target, const std:
8686
assert( target );
8787
unsigned numChannels = m_image.depth() / ( m_image.pixelType() == MImage::kFloat ? sizeof(float) : sizeof(unsigned char) );
8888
unsigned width, height;
89-
MStatus s = m_image.getSize( width, height );
89+
m_image.getSize( width, height );
9090
assert( width );
9191
assert( height );
9292

@@ -119,7 +119,7 @@ void FromMayaImageConverter::writeDepth( ImagePrimitivePtr target, const float *
119119
{
120120
assert( target );
121121
unsigned width, height;
122-
MStatus s = m_image.getSize( width, height );
122+
m_image.getSize( width, height );
123123
assert( width );
124124
assert( height );
125125

src/IECoreMaya/FromMayaUnitPlugConverter.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//////////////////////////////////////////////////////////////////////////
22
//
3-
// Copyright (c) 2008-2012, Image Engine Design Inc. All rights reserved.
3+
// Copyright (c) 2008-2015, Image Engine Design Inc. All rights reserved.
44
//
55
// Redistribution and use in source and binary forms, with or without
66
// modification, are permitted provided that the following conditions are
@@ -150,7 +150,6 @@ template<typename T>
150150
IECore::ObjectPtr FromMayaUnitPlugConverter<T>::doConversion( IECore::ConstCompoundObjectPtr operands ) const
151151
{
152152
typedef IECore::TypedData<T> ResultType;
153-
typedef typename IECore::TypedData<T>::Ptr ResultTypePtr;
154153

155154
MObject attr = plug().attribute();
156155
MFnUnitAttribute fnUAttr( attr );

src/IECoreMaya/LiveScene.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//////////////////////////////////////////////////////////////////////////
22
//
3-
// Copyright (c) 2013-2014, Image Engine Design Inc. All rights reserved.
3+
// Copyright (c) 2013-2015, Image Engine Design Inc. All rights reserved.
44
//
55
// Redistribution and use in source and binary forms, with or without
66
// modification, are permitted provided that the following conditions are
@@ -724,7 +724,7 @@ IECore::SceneInterfacePtr LiveScene::retrieveChild( const Name &name, MissingBeh
724724
sel.add( m_dagPath.fullPathName() + "|" + std::string( name ).c_str() );
725725

726726
MDagPath path;
727-
MStatus st = sel.getDagPath( 0, path );
727+
sel.getDagPath( 0, path );
728728

729729
if( !path.hasFn( MFn::kTransform ) )
730730
{

src/IECoreMaya/OpHolder.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//////////////////////////////////////////////////////////////////////////
22
//
3-
// Copyright (c) 2007-2011, Image Engine Design Inc. All rights reserved.
3+
// Copyright (c) 2007-2015, Image Engine Design Inc. All rights reserved.
44
//
55
// Redistribution and use in source and binary forms, with or without
66
// modification, are permitted provided that the following conditions are
@@ -113,7 +113,7 @@ void *OpHolder<B>::creator()
113113
template<typename B>
114114
MStatus OpHolder<B>::initialize()
115115
{
116-
MStatus s = inheritAttributesFrom( ParameterisedHolder<B>::typeName );
116+
MStatus s = OpHolder<B>::inheritAttributesFrom( ParameterisedHolder<B>::typeName );
117117
if( !s )
118118
{
119119
return s;

src/IECoreMaya/ParameterisedHolder.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//////////////////////////////////////////////////////////////////////////
22
//
3-
// Copyright (c) 2007-2011, Image Engine Design Inc. All rights reserved.
3+
// Copyright (c) 2007-2015, Image Engine Design Inc. All rights reserved.
44
//
55
// Redistribution and use in source and binary forms, with or without
66
// modification, are permitted provided that the following conditions are
@@ -299,7 +299,7 @@ MStatus ParameterisedHolder<B>::setParameterised( const std::string &className,
299299
MPlug pClassName( B::thisMObject(), aParameterisedClassName );
300300
MPlug pVersion( B::thisMObject(), aParameterisedVersion );
301301
MPlug pSearchPathEnvVar( B::thisMObject(), aParameterisedSearchPathEnvVar );
302-
MStatus s = pClassName.setValue( className.c_str() );
302+
pClassName.setValue( className.c_str() );
303303
pVersion.setValue( classVersion );
304304
pSearchPathEnvVar.setValue( searchPathEnvVar.c_str() );
305305

@@ -331,7 +331,7 @@ IECore::RunTimeTypedPtr ParameterisedHolder<B>::getParameterised( std::string *c
331331
int version;
332332
MString searchPathEnvVar;
333333

334-
MStatus s = pClassName.getValue( className );
334+
pClassName.getValue( className );
335335

336336
pVersion.getValue( version );
337337
pSearchPathEnvVar.getValue( searchPathEnvVar );

src/IECoreMaya/SceneShapeInterface.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,7 @@ MStatus SceneShapeInterface::compute( const MPlug &plug, MDataBlock &dataBlock )
781781
{
782782
m = coordSys->getTransform()->transform();
783783
}
784-
Imath::V3f s,h,r,t;
784+
Imath::V3f s(0), h(0), r(0), t(0);
785785
Imath::extractSHRT(m, s, h, r, t);
786786

787787
MFnNumericData fnData;

src/IECoreMaya/ToMayaLocatorConverter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//////////////////////////////////////////////////////////////////////////
22
//
3-
// Copyright (c) 2013, Image Engine Design Inc. All rights reserved.
3+
// Copyright (c) 2013-2015, Image Engine Design Inc. All rights reserved.
44
//
55
// Redistribution and use in source and binary forms, with or without
66
// modification, are permitted provided that the following conditions are
@@ -124,7 +124,7 @@ bool ToMayaLocatorConverter::doConversion( IECore::ConstObjectPtr from, MObject
124124
{
125125
m = transform->transform();
126126
}
127-
Imath::V3f s,h,r,t;
127+
Imath::V3f s(0), h(0), r(0), t(0);
128128
Imath::extractSHRT(m, s, h, r, t);
129129

130130
/// obtain local position and scale from locator

0 commit comments

Comments
 (0)