Commit18f5095

committed

minimize diff; fix missing paren

1 parentbe460bc commit18f5095Copy full SHA for 18f5095

File tree

1 file changed

+46

-50

lines changed

api
- Common.h

1 file changed

+46

-50

lines changed

`‎api/Common.h`

Lines changed: 46 additions & 50 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,92 +37,63 @@ typedef enum {`
`37`	`37`	`#defineSERIAL0x0`
`38`	`38`	`#defineDISPLAY0x1`
`39`	`39`
`40`		`-#ifdef __cplusplus`
`41`		`-}// extern "C"`
`42`		`-#endif`
`43`	`40`
`44`	`41`	`#ifdef __cplusplus`
	`42`	`+}// extern "C"`
`45`	`43`
`46`		`-template<classT,classL>`
`47`		`-automin(const T& a,const L& b) -> decltype(b < a ? b : a)`
`48`		`- {`
`49`		`-return (b < a) ? b : a;`
`50`		`- }`
`51`		`-`
`52`		`-template<classT,classL>`
`53`		`-automax(const T& a,const L& b) -> decltype(b < a ? b : a)`
`54`		`- {`
`55`		`-return (a < b) ? b : a;`
`56`		`- }`
`57`		`-`
`58`		`-`
`59`		`-template<classT,classU,classV>`
	`44`	`+template<classT,classU,classV>`
`60`	`45`	`autoconstrain(const T& amt,const U& low,const V& high) -> decltype(amt < low ? low : (amt > high ? high : amt))`
`61`	`46`	`{`
`62`	`47`	`return amt < low ? low : (amt > high ? high : amt);`
`63`	`48`	`}`
`64`		`-`
`65`		`-template<classT>`
	`49`	`+`
	`50`	`+template<classT>`
`66`	`51`	`autoradians(const T& deg) -> decltype(deg * DEG_TO_RAD)`
`67`	`52`	`{`
`68`	`53`	`return deg * DEG_TO_RAD;`
`69`	`54`	`}`
`70`	`55`
`71`		`-template<classT>`
	`56`	`+template<classT>`
`72`	`57`	`autodegrees(const T& rad) -> decltype(rad * RAD_TO_DEG)`
`73`	`58`	`{`
`74`	`59`	`return rad * RAD_TO_DEG;`
`75`	`60`	`}`
`76`	`61`
`77`		`-template<classT>`
	`62`	`+template<classT>`
`78`	`63`	`autosq(const T& x) -> decltype(x*x)`
`79`	`64`	`{`
`80`	`65`	`return x*x;`
`81`	`66`	`}`
`82`	`67`	`#else`
`83`	`68`	`#ifndef constrain`
`84`	`69`	`#defineconstrain(amt,low,high) \`
`85`		`-({__typeof__ (amt) _amt = (amt); \`
`86`		`-__typeof__ (low) _low = (low); \`
`87`		`-__typeof__ (high) _high = (high); \`
`88`		`-_amt < _low ? _low : (_amt > _high ? _high :_amt); }`
	`70`	`+ ({__typeof__ (amt) _amt = (amt); \`
	`71`	`+__typeof__ (low) _low = (low); \`
	`72`	`+__typeof__ (high) _high = (high); \`
	`73`	`+ _amt < _low ? _low : (_amt > _high ? _high :_amt); })`
`89`	`74`	`#endif`
`90`		`-`
	`75`	`+`
`91`	`76`	`#ifndef radians`
`92`	`77`	`#defineradians(deg) \`
`93`		`-({__typeof__ (deg) _deg = deg; \`
`94`		`-_deg * DEG_TO_RAD; })`
	`78`	`+ ({__typeof__ (deg) _deg = deg; \`
	`79`	`+ _deg * DEG_TO_RAD; })`
`95`	`80`	`#endif`
`96`		`-`
	`81`	`+`
`97`	`82`	`#ifndef degrees`
`98`	`83`	`#definedegrees(rad) \`
`99`		`-({__typeof__ (rad) _rad = rad; \`
`100`		`-_rad * RAD_TO_DEG; })`
	`84`	`+ ({__typeof__ (rad) _rad = rad; \`
	`85`	`+ _rad * RAD_TO_DEG; })`
`101`	`86`	`#endif`
`102`		`-`
	`87`	`+`
`103`	`88`	`#ifndef sq`
`104`	`89`	`#definesq(x) \`
`105`		`- ({__typeof__ (x) _x = x; \`
`106`		`- _x * _x; })`
`107`		`- #endif`
`108`		`-`
`109`		`- #ifndef min`
`110`		`- #definemin(a,b) \`
`111`		`- ({__typeof__ (a) _a = (a); \`
`112`		`-__typeof__ (b) _b = (b); \`
`113`		`- _a < _b ? _a : _b; })`
`114`		`- #endif`
`115`		`-`
`116`		`- #ifndef max`
`117`		`- #definemax(a,b) \`
`118`		`- ({__typeof__ (a) _a = (a); \`
`119`		`-__typeof__ (b) _b = (b); \`
`120`		`- _a > _b ? _a : _b; })`
	`90`	`+ ({__typeof__ (x) _x = x; \`
	`91`	`+ _x * _x; })`
`121`	`92`	`#endif`
`122`	`93`	`#endif`
`123`	`94`
`124`	`95`	`#ifdef __cplusplus`
`125`		`-extern"C"{`
	`96`	`+extern"C"{`
`126`	`97`	`#endif`
`127`	`98`
`128`	`99`	`typedefvoid (*voidFuncPtr)(void);`
`@@ -189,8 +160,32 @@ void loop(void);`
`189`	`160`
`190`	`161`	`#ifdef __cplusplus`
`191`	`162`	`}// extern "C"`
`192`		`-#endif`
`193`	`163`
	`164`	`+template<classT,classL>`
	`165`	`+automin(const T& a,const L& b) -> decltype((b < a) ? b : a)`
	`166`	`+ {`
	`167`	`+return (b < a) ? b : a;`
	`168`	`+ }`
	`169`	`+`
	`170`	`+template<classT,classL>`
	`171`	`+automax(const T& a,const L& b) -> decltype((b < a) ? b : a)`
	`172`	`+ {`
	`173`	`+return (a < b) ? b : a;`
	`174`	`+ }`
	`175`	`+#else`
	`176`	`+ #ifndef min`
	`177`	`+ #definemin(a,b) \`
	`178`	`+ ({__typeof__ (a) _a = (a); \`
	`179`	`+__typeof__ (b) _b = (b); \`
	`180`	`+ _a < _b ? _a : _b; })`
	`181`	`+ #endif`
	`182`	`+ #ifndef max`
	`183`	`+ #definemax(a,b) \`
	`184`	`+ ({__typeof__ (a) _a = (a); \`
	`185`	`+__typeof__ (b) _b = (b); \`
	`186`	`+ _a > _b ? _a : _b; })`
	`187`	`+ #endif`
	`188`	`+#endif`
`194`	`189`
`195`	`190`	`#ifdef __cplusplus`
`196`	`191`
`@@ -213,3 +208,4 @@ void randomSeed(unsigned long);`
`213`	`208`	`longmap(long,long,long,long,long);`
`214`	`209`
`215`	`210`	`#endif// __cplusplus`
	`211`	`+`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit18f5095

File tree

1 file changed

1 file changed

`‎api/Common.h`

0 commit comments