Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions tests/src/integration/ccm/tsocket.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@

#include <sstream>

#ifndef _WIN32
#ifdef _WIN32
#include <ws2tcpip.h>
#else
#include <arpa/inet.h>
#include <cstring>
#include <errno.h>
Expand Down Expand Up @@ -125,7 +127,7 @@ void Socket::establish_connection(const std::string& ip_address, unsigned short
struct sockaddr_in ipv4_socket_address;
ipv4_socket_address.sin_family = AF_INET;
ipv4_socket_address.sin_port = htons(port);
ipv4_socket_address.sin_addr.s_addr = inet_addr(ip_address.c_str());
inet_pton(AF_INET, ip_address.c_str(), &ipv4_socket_address.sin_addr.s_addr);
if (connect(handle_, (struct sockaddr*)(&ipv4_socket_address), sizeof(struct sockaddr_in)) != 0) {
std::string message = "Failed to Establish Connection: ";
#ifdef _WIN32
Expand Down
4 changes: 4 additions & 0 deletions tests/src/integration/objects/retry_policy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@

#include "retry_policy.hpp"

#if defined(_MSC_VER)
#pragma warning(disable : 4996)
#endif

using namespace test::driver;

DowngradingConsistencyRetryPolicy::DowngradingConsistencyRetryPolicy()
Expand Down
2 changes: 1 addition & 1 deletion tests/src/unit/tests/test_serialization.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

using namespace datastax::internal;

TEST(SerializationTest, DecodeZigZag) { ASSERT_EQ(1LL << 63, decode_zig_zag((long)-1)); }
TEST(SerializationTest, DecodeZigZag) { ASSERT_EQ(1LL << 63, decode_zig_zag((uint64_t)-1)); }

TEST(SerializationTest, DecodeByte) {
const signed char input[2] = { -1, 0 };
Expand Down