Merge branch 3.16 into libcom/master

This commit is contained in:
Ralph Lange
2017-10-20 17:07:26 +02:00
2 changed files with 9 additions and 9 deletions
+8 -8
View File
@@ -16,11 +16,11 @@ install:
script:
- ./.ci/travis-build.sh
env:
- BRCORE=master
- CMPLR=clang
- USR_CXXFLAGS=-std=c++11
- CMPLR=clang USR_CXXFLAGS=-std=c++11
- WINE=32 TEST=NO STATIC=YES
- WINE=32 TEST=NO STATIC=NO
- RTEMS=4.10 TEST=NO
- RTEMS=4.9 TEST=NO
- BRCORE=master
- CMPLR=clang
- USR_CXXFLAGS=-std=c++11
- CMPLR=clang USR_CXXFLAGS=-std=c++11
- WINE=32 TEST=NO STATIC=YES
- WINE=32 TEST=NO STATIC=NO
- RTEMS=4.10 TEST=NO
- RTEMS=4.9 TEST=NO
+1 -1
View File
@@ -457,7 +457,7 @@ size_t
}
size_t
cvtInt32OctalString(epicsInt32 val, char *pdest)
cvtInt32ToOctalString(epicsInt32 val, char *pdest)
{
if (val == 0) {
*pdest++ = '0';