fix g++ build errors
Merge branch 'js_date'