Permalink
Browse files

Fixed a problem that gcc outputs warning for unused variables.

Adjust library settings for newer LAPACK.
  • Loading branch information...
ddeguchi committed Dec 27, 2011
1 parent 66efc77 commit f960cd6b12b32b0916f11026ae91c03bc1f0de71
Showing with 13 additions and 13 deletions.
  1. +4 −4 build/makeinclude
  2. +1 −1 mist/filter/boundary.h
  3. +7 −7 mist/interpolate.h
  4. +1 −1 mist/vector.h
@@ -6,17 +6,17 @@ LDLIBS = -L../lib -L/usr/local/lib -L/usr/lib -L/usr/X11R6/lib

OTHERINCLUDE =

CFLAGS = -Wall -O2
CXXFLAGS = -Wall -O2
CFLAGS = -Wall -W -O2
CXXFLAGS = -Wall -W -O2

RELEASEFLAGS = $(CXXFLAGS) -DNDEBUG
DEBUGFLAGS = $(CXXFLAGS) -DDEBUG

IMGLIBS = -ljpeg -lpng -ltiff
#IMGLIBS = -ljpeg -lpng -ltiff -lgif
LIBS = -lpthread -lz -lm
LAPACKLIBS = -L../lib -llapack -lblas -lI77 -lF77
ATLASLIBS = -L../lib -llapack -lcblaswr -lcblas -latlas -lF77
LAPACKLIBS = -L../lib -lf2c -llapack -lblas
#LAPACKLIBS = -L../lib -llapack_atlas -lblas -latlas
MKLASLIBS = -L../lib -lmkl_lapack

# Be quiet when building...
@@ -209,7 +209,7 @@ namespace __boundary_controller__


template < class Array, class neighbor, class Functor >
typename Array::size_type boundary( Array &in, typename Array::value_type border, typename Array::value_type inside, bool boundary_is_border, const neighbor dmy, Functor f )
typename Array::size_type boundary( Array &in, typename Array::value_type border, typename Array::value_type inside, bool boundary_is_border, const neighbor /* dmy */, Functor f )
{
typedef typename Array::size_type size_type;
typedef typename Array::value_type value_type;
@@ -274,8 +274,8 @@ namespace __mean__
typename array2< T, Allocator >::size_type i2,
typename array2< T, Allocator >::size_type j1,
typename array2< T, Allocator >::size_type j2,
typename array2< T, Allocator >::size_type k1,
typename array2< T, Allocator >::size_type k2,
typename array2< T, Allocator >::size_type /* k1 */,
typename array2< T, Allocator >::size_type /* k2 */,
double xs,
double xe,
double ys,
@@ -1029,9 +1029,9 @@ namespace __linear__
typename array2< T, Allocator >::size_type i2,
typename array2< T, Allocator >::size_type j1,
typename array2< T, Allocator >::size_type j2,
typename array2< T, Allocator >::size_type k1,
typename array2< T, Allocator >::size_type k2,
double x, double y, double z )
typename array2< T, Allocator >::size_type /* k1 */,
typename array2< T, Allocator >::size_type /* k2 */,
double x, double y, double /* z */ )
{
typedef typename array2< T, Allocator >::value_type value_type;
double min = type_limits< value_type >::minimum( );
@@ -1942,8 +1942,8 @@ namespace __sinc__
static double interpolate( const array2< T, Allocator > &in,
typename array2< T, Allocator >::difference_type ix,
typename array2< T, Allocator >::difference_type iy,
typename array2< T, Allocator >::difference_type iz,
double x, double y, double z )
typename array2< T, Allocator >::difference_type /* iz */,
double x, double y, double /* z */ )
{
typedef typename array2< T, Allocator >::difference_type difference_type;
typedef typename array2< T, Allocator >::value_type value_type;
@@ -456,7 +456,7 @@ class vector2
vector2( const value_type &xx, const value_type &yy ) : x( xx ), y( yy ){ }

/// @brief ( vv, vv ) のベクトルを作成する
vector2( const value_type &vv ) : x( vv ), y( vv ){ }
explicit vector2( const value_type &vv ) : x( vv ), y( vv ){ }


/// @brief 他の2次元ベクトルで要素の型が異なるものから同じ要素を持つベクトルを作成する

0 comments on commit f960cd6

Please sign in to comment.