浏览代码

fixed some warning issues

Sven Sickert 11 年之前
父节点
当前提交
286478ffe1
共有 2 个文件被更改,包括 11 次插入11 次删除
  1. 5 5
      core/basics/binstream.h
  2. 6 6
      core/image/MultiChannelImage3DT.tcc

+ 5 - 5
core/basics/binstream.h

@@ -318,11 +318,11 @@ inline obinstream& operator<<(obinstream &s, const LinAl::MatrixC<Tp> &A) {
   return s;
   return s;
 }
 }
 
 
-#else
-#ifndef LINAL_WARNING
-#warning LinAl addons will not be compiled.
-#define LINAL_WARNING
-#endif
+// #else
+// #ifndef LINAL_WARNING
+// #warning LinAl addons will not be compiled.
+// #define LINAL_WARNING
+// #endif
 #endif
 #endif
 
 
  
  

+ 6 - 6
core/image/MultiChannelImage3DT.tcc

@@ -899,7 +899,7 @@ void MultiChannelImage3DT<P>::setPixelFloat( int x, int y, int z, int channel, d
   throw( "this type is not implemented\n" );
   throw( "this type is not implemented\n" );
 }
 }
 
 
-#define SET_FUNCS_PROTO_MACRO(MYTYPE) \
+#define SET_FUNCS_PROTO_MACRO3D(MYTYPE) \
 template<>\
 template<>\
 int MultiChannelImage3DT<MYTYPE>::getPixelInt(int x, int y, int z, int channel) const;\
 int MultiChannelImage3DT<MYTYPE>::getPixelInt(int x, int y, int z, int channel) const;\
 template<>\
 template<>\
@@ -909,11 +909,11 @@ void MultiChannelImage3DT<MYTYPE>::setPixelInt(int x, int y, int z, int channel,
 template<>\
 template<>\
 void MultiChannelImage3DT<MYTYPE>::setPixelFloat(int x, int y, int z, int channel, double pixel);
 void MultiChannelImage3DT<MYTYPE>::setPixelFloat(int x, int y, int z, int channel, double pixel);
 
 
-SET_FUNCS_PROTO_MACRO( double )
-SET_FUNCS_PROTO_MACRO( int )
-SET_FUNCS_PROTO_MACRO( long int )
-SET_FUNCS_PROTO_MACRO( float )
-SET_FUNCS_PROTO_MACRO( unsigned int )
+SET_FUNCS_PROTO_MACRO3D( double )
+SET_FUNCS_PROTO_MACRO3D( int )
+SET_FUNCS_PROTO_MACRO3D( long int )
+SET_FUNCS_PROTO_MACRO3D( float )
+SET_FUNCS_PROTO_MACRO3D( unsigned int )
 
 
 } // namespace
 } // namespace