Commit new cpp and sfunction windows and mac.