eliminated warnings when compiling with GCC 4.3

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/branches/lmms-mv@671 0778d3d1-df1d-0410-868b-ea421aaaa00d

include/automatable_model.h

@@ -279,8 +279,6 @@ public:
 } ;
 
 
-//#include "automatable_model_templates.h"
-
 
 #define generateModelPrimitive(type,type2)					\
 		typedef automatableModel<type,type2> type##Model;		\
@@ -292,16 +290,21 @@ public:
 generateModelPrimitive(float,float);
 generateModelPrimitive(int,int);
 
-class boolModel : public automatableModel<bool, signed char> {
+class boolModel : public automatableModel<bool, signed char>
+{
 public:
 	boolModel(  const bool _val = FALSE,
 				::model * _parent = NULL,
 				bool _default_constructed = FALSE ) : 
-	automatableModel<bool, signed char>( _val, FALSE, TRUE, defaultRelStep(), _parent, _default_constructed )
-	{}
-};
+	autoModel( _val, FALSE, TRUE, defaultRelStep(), _parent,
+							_default_constructed )
+	{
+	}
+
+} ;
 
 typedef automatableModelView<bool, signed char> boolModelView;
 
+
 #endif
 

include/journalling_object.h

@@ -105,7 +105,7 @@ public:
 	journallingObject( void );
 	virtual ~journallingObject();
 
-	inline const jo_id_t id( void ) const
+	inline jo_id_t id( void ) const
 	{
 		return( m_id );
 	}

include/types.h

@@ -1,7 +1,7 @@
 /*
  * types.h - typedefs for common types that are used in the whole app
  *
- * Copyright (c) 2004-2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -26,6 +26,8 @@
 #ifndef _TYPES_H
 #define _TYPES_H
 
+#include <limits>
+
 typedef unsigned char	Uint8;
 typedef signed char	Sint8;
 typedef unsigned short	Uint16;
@@ -60,13 +62,15 @@ typedef Uint32 jo_id_t;			// (unique) ID of a journalling object
 template<typename T>
 struct valueRanges
 {
-	enum
+	static inline T min( void )
 	{
-		max = static_cast<T>( static_cast<T>( ~0 ) > 0 ?
-			~0 : ( ( ( T ) 1 << ( sizeof( T ) * 8 - 1 ) ) - 1 ) ),
-		min = static_cast<T>( static_cast<T>( ~0 ) > 0 ?
-							0 : ( -max - 1 ) )
-	} ;
+		return( std::numeric_limits<T>::min() );
+	}
+
+	static inline T max( void )
+	{
+		return( std::numeric_limits<T>::max() );
+	}
 } ;