Skip to content

Commit

Permalink
Merge pull request #177 from hversche/fix-stlport4-build-drqs-78626169
Browse files Browse the repository at this point in the history
Fix stlport4 build issues on Solaris
  • Loading branch information
mversche committed Feb 22, 2016
2 parents bbbbd3b + e16f403 commit 140ae43
Show file tree
Hide file tree
Showing 12 changed files with 19 additions and 3 deletions.
2 changes: 1 addition & 1 deletion groups/bdl/bdlb/bdlb_cstringhash.h
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ bsl::size_t bdlb::CStringHash::operator()(const char *argument) const
BSLS_ASSERT_SAFE(argument);

bslh::SpookyHashAlgorithm hash;
hash(argument, strlen(argument));
hash(argument, bsl::strlen(argument));
return static_cast<bsl::size_t>(hash.computeHash());
}

Expand Down
2 changes: 1 addition & 1 deletion groups/bdl/bdldfp/bdldfp_decimalconvertutil.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ Decimal64 DecimalConvertUtil::decimal64FromDouble(double binary)
// to its integer part. If it's small enough (using 1e-17, generously
// below the 1e-16 computed above), skip the verification.
double dn, r;
r = modf(d, &dn);
r = bsl::modf(d, &dn);
if ((dn != 0 && r / dn < 1e-17) || r == 0) {
return rv; // RETURN
}
Expand Down
1 change: 1 addition & 0 deletions groups/bsl/bsls/bsls_atomicoperations_x64_all_gcc.t.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include <bsls_atomicoperations_x64_all_gcc.h>

#include <stdlib.h>
#include <cstdlib>
#include <iostream>

Expand Down
1 change: 1 addition & 0 deletions groups/bsl/bsls/bsls_cpp11.t.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include <bsls_cpp11.h>

#include <stdlib.h>
#include <cstdlib>
#include <iostream>

Expand Down
2 changes: 2 additions & 0 deletions groups/bsl/bslstl/bslstl_multiset.t.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
#include <bsltf_testvaluesarray.h>
#include <bsltf_stdtestallocator.h>

#include <stdlib.h> // atoi

// ============================================================================
// ADL SWAP TEST HELPER
// ----------------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions groups/bsl/bslstl/bslstl_ownerless.t.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <bsls_bsltestutil.h>
#include <bsls_types.h>

#include <stdio.h> // printf
#include <stdlib.h> // atoi
#include <string.h> // strcmp, strcpy

Expand Down
4 changes: 4 additions & 0 deletions groups/bsl/bslstl/bslstl_pair.t.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@

#include <bslmf_issame.h>

#include <stdio.h> // printf
#include <stdlib.h> // atoi
#include <string.h> // strcmp

#include <cstdio>
#include <cstdlib>
#include <cstring>
Expand Down
2 changes: 2 additions & 0 deletions groups/bsl/bslstl/bslstl_priorityqueue.t.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
#include <bsltf_testvaluesarray.h>
#include <bsltf_stdtestallocator.h>

#include <stdlib.h> // atoi

// ============================================================================
// ADL SWAP TEST HELPER
// ----------------------------------------------------------------------------
Expand Down
2 changes: 2 additions & 0 deletions groups/bsl/bslstl/bslstl_queue.t.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
#include <bsltf_testvaluesarray.h>
#include <bsltf_stdtestallocator.h>

#include <stdlib.h> // atoi

// ============================================================================
// ADL SWAP TEST HELPER
// ----------------------------------------------------------------------------
Expand Down
2 changes: 2 additions & 0 deletions groups/bsl/bslstl/bslstl_set.t.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
#include <bsltf_testvaluesarray.h>
#include <bsltf_stdtestallocator.h>

#include <stdlib.h> // atoi

// ============================================================================
// ADL SWAP TEST HELPER
// ----------------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions groups/bsl/bslstl/bslstl_stack.t.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@

#include <cstdio>
#include <cstdlib>
#include <stdlib.h> // atoi
#include <string.h>

// ============================================================================
Expand Down
2 changes: 1 addition & 1 deletion groups/bsl/bslstl/bslstl_vector.t.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>

#include <string.h> // strlen

using namespace BloombergLP;
using namespace bsl;
Expand Down

0 comments on commit 140ae43

Please sign in to comment.