Skip to content

Commit 0d49b83

Browse files
committed
Fix lint errors.
1 parent c2f9b80 commit 0d49b83

File tree

5 files changed

+26
-16
lines changed

5 files changed

+26
-16
lines changed

Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,10 @@ + (void)setUpDefaults {
198198
// SSL certs.
199199
NSString *project = [[NSProcessInfo processInfo] environment][@"PROJECT_ID"];
200200
NSString *targetBackend = [[NSProcessInfo processInfo] environment][@"TARGET_BACKEND"];
201+
// Forcing use of nightly.Add commentMore actions
202+
// TODO(types/ehsann): remove this before merging into main.
203+
targetBackend = @"nightly";
204+
project = @"firestore-sdk-nightly";
201205
NSString *host;
202206
if (targetBackend) {
203207
if ([targetBackend isEqualToString:@"emulator"]) {

Firestore/core/src/util/quadruple.cc

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,23 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "quadruple.h"
16-
#include <ctype.h>
17-
#include <stdint.h>
15+
#include "Firestore/core/src/util/quadruple.h"
16+
17+
#include <cctype>
1818
#include <cmath>
19+
#include <cstdint>
1920
#include <limits>
20-
#include "quadruple_builder.h"
21+
#include <vector>
22+
23+
#include "Firestore/core/src/util/quadruple_builder.h"
2124

2225
namespace firebase {
2326
namespace firestore {
2427
namespace util {
2528

29+
using std::signbit;
30+
using std::fpclassify;
31+
2632
namespace {
2733
constexpr int64_t kHashCodeOfNan = 7652541255;
2834
}
@@ -241,4 +247,4 @@ int64_t Quadruple::HashValue() const {
241247

242248
} // namespace util
243249
} // namespace firestore
244-
} // namespace firebase
250+
} // namespace firebase

Firestore/core/src/util/quadruple.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include <stdint.h>
15+
#include <cstdint>
1616
#include <iomanip>
1717
#include <ios>
1818
#include <sstream>
1919
#include <string>
2020

21-
#ifndef FIRESTORE_CORE_UTIL_QUADRUPLE_H_
22-
#define FIRESTORE_CORE_UTIL_QUADRUPLE_H_
21+
#ifndef FIRESTORE_CORE_SRC_UTIL_QUADRUPLE_H_
22+
#define FIRESTORE_CORE_SRC_UTIL_QUADRUPLE_H_
2323

2424
namespace firebase {
2525
namespace firestore {
@@ -97,4 +97,4 @@ class Quadruple {
9797
} // namespace firestore
9898
} // namespace firebase
9999

100-
#endif // FIRESTORE_CORE_UTIL_QUADRUPLE_H_
100+
#endif // FIRESTORE_CORE_SRC_UTIL_QUADRUPLE_H_

Firestore/core/src/util/quadruple_builder.cc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// See the License for the specific language governing permissions and
1414
// limitations under the License.
1515

16-
#include "quadruple_builder.h"
16+
#include "Firestore/core/src/util/quadruple_builder.h"
1717

1818
#include <array>
1919
#include <cmath>
@@ -244,7 +244,6 @@ static std::array<std::array<uint64_t, 4>, 33> NEG_POWERS_OF_2 = {
244244
{{static_cast<uint64_t>(-9), 0x3b9aca0000000000LL, 0x0000000000000000LL,
245245
0x0000000000000001LL}}, // ***
246246
// 7: 2^-(2^6) = 2^-64
247-
// = 5.42101086242752217003726400434970855712890625E-20
248247
// =
249248
// 0.542101086242752217003726400434970855712890625e-19
250249
{{static_cast<uint64_t>(-19), 0x8ac7230489e80000LL, 0x0000000000000000LL,
@@ -660,8 +659,8 @@ void QuadrupleBuilder::multPacked3x64_simply(std::array<uint64_t, 4>& factor1,
660659
for (int32_t i = (0); i < (static_cast<int32_t>((result).size())); i++) {
661660
result[i] = 0LL;
662661
}
663-
// TODO2 19.01.16 21:23:06 for the next version -- rebuild the table of powers
664-
// to make the numbers unpacked, to avoid packing/unpacking
662+
// TODO(dgay): 19.01.16 21:23:06 for the next version -- rebuild the table of
663+
// powers to make the numbers unpacked, to avoid packing/unpacking
665664
unpack_3x64_to_6x32(factor1, this->buffer6x32A);
666665
unpack_3x64_to_6x32(factor2, this->buffer6x32B);
667666
for (int32_t i = (6) - 1; i >= (0); i--) { // compute partial 32-bit products

Firestore/core/src/util/quadruple_builder.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@
1616
#ifndef FIRESTORE_CORE_SRC_UTIL_QUADRUPLE_BUILDER_H_
1717
#define FIRESTORE_CORE_SRC_UTIL_QUADRUPLE_BUILDER_H_
1818

19-
#include <math.h>
20-
#include <array>
2119
#include <bit>
2220
#include <cstddef>
2321
#include <cstdint>
22+
23+
#include <array>
24+
#include <cmath>
2425
#include <string>
2526
#include <vector>
2627

@@ -95,4 +96,4 @@ class QuadrupleBuilder {
9596
} // namespace firestore
9697
} // namespace firebase
9798

98-
#endif
99+
#endif // FIRESTORE_CORE_SRC_UTIL_QUADRUPLE_BUILDER_H_

0 commit comments

Comments
 (0)