Merge branch 3.16 into libcom/master
This commit is contained in:
+8
-8
@@ -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
|
||||
|
||||
@@ -457,7 +457,7 @@ size_t
|
||||
}
|
||||
|
||||
size_t
|
||||
cvtInt32OctalString(epicsInt32 val, char *pdest)
|
||||
cvtInt32ToOctalString(epicsInt32 val, char *pdest)
|
||||
{
|
||||
if (val == 0) {
|
||||
*pdest++ = '0';
|
||||
|
||||
Reference in New Issue
Block a user