Skip to content

Commit 4682306

Browse files
author
Rafał Hibner
committed
Merge branch 'VcpkgOpenTelemetry' into combined3
2 parents 8e20ee8 + 334488d commit 4682306

4 files changed

Lines changed: 4 additions & 3 deletions

File tree

cpp/src/arrow/util/align_util.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
// under the License.
1717

1818
#include "arrow/util/align_util.h"
19+
#include "arrow/util/windows_compatibility.h"
1920

2021
#include "arrow/array.h"
2122
#include "arrow/chunked_array.h"

cpp/src/arrow/util/future.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
// KIND, either express or implied. See the License for the
1515
// specific language governing permissions and limitations
1616
// under the License.
17-
1817
#include "arrow/util/future.h"
18+
#include "arrow/util/windows_compatibility.h"
1919

2020
#include <algorithm>
2121
#include <atomic>

cpp/src/arrow/util/thread_pool.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
// KIND, either express or implied. See the License for the
1515
// specific language governing permissions and limitations
1616
// under the License.
17-
1817
#include "arrow/util/thread_pool.h"
18+
#include "arrow/util/windows_compatibility.h"
1919

2020
#include <algorithm>
2121
#include <condition_variable>

cpp/src/arrow/util/tracing.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
// KIND, either express or implied. See the License for the
1515
// specific language governing permissions and limitations
1616
// under the License.
17-
1817
#include "arrow/util/tracing.h"
18+
#include "arrow/util/windows_compatibility.h"
1919

2020
#include "arrow/util/config.h"
2121
#include "arrow/util/tracing_internal.h"

0 commit comments

Comments
 (0)