Removed usage of msvc __noop extension

3 files changed, 5 insertions, 5 deletions

diff --git a/Opcode/Ice/IceMemoryMacros.h b/Opcode/Ice/IceMemoryMacros.h
index 53bce50..346345b 100644
--- a/Opcode/Ice/IceMemoryMacros.h
+++ b/Opcode/Ice/IceMemoryMacros.h
@@ -78,7 +78,7 @@
 	#define SAFE_DESTRUCT(x)	if (x) { (x)->SelfDestruct();	(x) = null; }	//!< Safe ICE-style release

 

 #ifdef __ICEERROR_H__

-	#define CHECKALLOC(x)		if(!x) return SetIceError("Out of memory.", EC_OUT_OF_MEMORY);	//!< Standard alloc checking. HANDLE WITH CARE.

+	#define CHECKALLOC(x)		if(!x) return SetIceError;;  // ("Out of memory.", EC_OUT_OF_MEMORY);	//!< Standard alloc checking. HANDLE WITH CARE.

 #else

 	#define CHECKALLOC(x)		if(!x) return false;

 #endif

diff --git a/Opcode/OPC_MeshInterface.cpp b/Opcode/OPC_MeshInterface.cpp
index e47451e..bfd7180 100644
--- a/Opcode/OPC_MeshInterface.cpp
+++ b/Opcode/OPC_MeshInterface.cpp
@@ -227,7 +227,7 @@ bool MeshInterface::SetCallback(RequestCallback callback, void* user_data)
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

 bool MeshInterface::SetPointers(const IndexedTriangle* tris, const IcePoint* verts)

 {

-	if(!tris || !verts)	return SetIceError("MeshInterface::SetPointers: pointer is null", null);

+	if (!tris || !verts)	return SetIceError;  // ("MeshInterface::SetPointers: pointer is null", null);

 

 	mTris	= tris;

 	mVerts	= verts;

@@ -244,8 +244,8 @@ bool MeshInterface::SetPointers(const IndexedTriangle* tris, const IcePoint* ver
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

 bool MeshInterface::SetStrides(udword tri_stride, udword vertex_stride)

 {

-	if(tri_stride<sizeof(IndexedTriangle))	return SetIceError("MeshInterface::SetStrides: invalid triangle stride", null);

-	if(vertex_stride<sizeof(IcePoint))			return SetIceError("MeshInterface::SetStrides: invalid vertex stride", null);

+	if (tri_stride < sizeof(IndexedTriangle))	return SetIceError;  // ("MeshInterface::SetStrides: invalid triangle stride", null);

+	if (vertex_stride < sizeof(IcePoint))			return SetIceError;  // ("MeshInterface::SetStrides: invalid vertex stride", null);

 

 	mTriStride		= tri_stride;

 	mVertexStride	= vertex_stride;

diff --git a/Opcode/OPC_Model.cpp b/Opcode/OPC_Model.cpp
index 0616c4d..b713dbb 100644
--- a/Opcode/OPC_Model.cpp
+++ b/Opcode/OPC_Model.cpp
@@ -142,7 +142,7 @@ bool Model::Build(const OPCODECREATE& create)
 	if(!create.mIMesh || !create.mIMesh->IsValid())	return false;

 

 	// For this model, we only support complete trees

-	if(create.mSettings.mLimit!=1)	return SetIceError("OPCODE WARNING: supports complete trees only! Use mLimit = 1.\n", null);

+	if (create.mSettings.mLimit != 1)	return SetIceError;  // ("OPCODE WARNING: supports complete trees only! Use mLimit = 1.\n", null);

 

 	// Look for degenerate faces.

 	udword NbDegenerate = create.mIMesh->CheckTopology();