diff options
Diffstat (limited to 'externals/grill/flext/source')
| -rw-r--r-- | externals/grill/flext/source/flattr.cpp | 4 | ||||
| -rw-r--r-- | externals/grill/flext/source/flext.cpp | 5 | ||||
| -rwxr-xr-x | externals/grill/flext/source/flitem.cpp | 2 | ||||
| -rwxr-xr-x | externals/grill/flext/source/flprefix.h | 5 | ||||
| -rw-r--r-- | externals/grill/flext/source/flsupport.cpp | 6 | ||||
| -rw-r--r-- | externals/grill/flext/source/flsupport.h | 2 |
6 files changed, 16 insertions, 8 deletions
diff --git a/externals/grill/flext/source/flattr.cpp b/externals/grill/flext/source/flattr.cpp index 014ffdcb..ffb6b6fd 100644 --- a/externals/grill/flext/source/flattr.cpp +++ b/externals/grill/flext/source/flattr.cpp @@ -22,8 +22,8 @@ WARRANTIES, see the file, "license.txt," in this distribution. #endif flext_base::attritem::attritem(const t_symbol *t,metharg tp,methfun f,int fl): - item(t,0,NULL),argtp(tp), - fun(f),flags(fl) + item(t,0,NULL), + flags(fl),argtp(tp),fun(f) {} flext_base::attritem::~attritem() diff --git a/externals/grill/flext/source/flext.cpp b/externals/grill/flext/source/flext.cpp index e54ad339..baf33c42 100644 --- a/externals/grill/flext/source/flext.cpp +++ b/externals/grill/flext/source/flext.cpp @@ -180,7 +180,10 @@ void flext_base::m_assist(long msg,long arg,char *s) strcpy(s,arg < incnt && indesc[arg]?indesc[arg]:""); break; case 2: //ASSIST_OUTLET: - strcpy(s,arg < outcnt && outdesc[arg]?outdesc[arg]:""); + if(arg < outcnt) + strcpy(s,outdesc[arg]?outdesc[arg]:""); + else + strcpy(s,arg == outcnt && procattr?"Attributes":""); break; } #endif diff --git a/externals/grill/flext/source/flitem.cpp b/externals/grill/flext/source/flitem.cpp index ddcf570b..1e5a26a6 100755 --- a/externals/grill/flext/source/flitem.cpp +++ b/externals/grill/flext/source/flitem.cpp @@ -17,7 +17,7 @@ WARRANTIES, see the file, "license.txt," in this distribution. flext_base::item::item(const t_symbol *t,int inl,attritem *a): - inlet(inl),tag(t),attr(a),nxt(NULL) + tag(t),inlet(inl),attr(a),nxt(NULL) {} flext_base::item::~item() diff --git a/externals/grill/flext/source/flprefix.h b/externals/grill/flext/source/flprefix.h index c6e0a267..f12d1320 100755 --- a/externals/grill/flext/source/flprefix.h +++ b/externals/grill/flext/source/flprefix.h @@ -153,6 +153,11 @@ WARRANTIES, see the file, "license.txt," in this distribution. #define FLEXT_OS FLEXT_OS_UNKNOWN #endif #endif + + // This is important for method and attribute callbacks + #pragma enumsalwaysint on + // This is important for everything + #pragma bool on #elif defined(__GNUG__) // GNU C++ diff --git a/externals/grill/flext/source/flsupport.cpp b/externals/grill/flext/source/flsupport.cpp index f8717d02..ecc39153 100644 --- a/externals/grill/flext/source/flsupport.cpp +++ b/externals/grill/flext/source/flsupport.cpp @@ -119,12 +119,12 @@ void flext::GetAString(const t_atom &a,char *buf,int szbuf) #endif } -int flext::FoldBits(unsigned long h,int bits) +unsigned int flext::FoldBits(unsigned long h,int bits) { if(!bits) return 0; const int hmax = (1<<bits)-1; - int ret = 0; - for(int i = 0; i < sizeof(h)*8; i += bits) + unsigned int ret = 0; + for(unsigned int i = 0; i < sizeof(h)*8; i += bits) ret = ret^((h>>i)&hmax); return ret; } diff --git a/externals/grill/flext/source/flsupport.h b/externals/grill/flext/source/flsupport.h index 14140c99..56c43bc6 100644 --- a/externals/grill/flext/source/flsupport.h +++ b/externals/grill/flext/source/flsupport.h @@ -173,7 +173,7 @@ public: /*! \brief Fold value to a number of bits \remark Good for hash generation */ - static int FoldBits(unsigned long h,int bits); + static unsigned int FoldBits(unsigned long h,int bits); //! \brief How many bits are necessary to represent n static int Int2Bits(unsigned long n); |