Skip to content

Commit

Permalink
fix compilation issues raised by newer compilers (#121)
Browse files Browse the repository at this point in the history
  • Loading branch information
fenollp authored Dec 8, 2021
1 parent e7dec21 commit 32096f4
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.2.1
4.2.2
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax=docker.io/docker/dockerfile:1@sha256:42399d4635eddd7a9b8a24be879d2f9a930d0ed040a61324cfdf59ef1357b3b2

FROM --platform=$BUILDPLATFORM docker.io/whilp/buildifier@sha256:67da91fdddd40e9947153bc9157ab9103c141fcabcdbf646f040ba7a763bc531 AS buildifier
FROM --platform=$BUILDPLATFORM docker.io/library/ubuntu:20.04@sha256:82becede498899ec668628e7cb0ad87b6e1c371cb8a1e597d83a47fac21d6af3 AS ubuntu
FROM --platform=$BUILDPLATFORM docker.io/library/ubuntu:20.04@sha256:626ffe58f6e7566e00254b638eb7e0f3b11d4da9675088f4781a50ae288f3322 AS ubuntu

FROM ubuntu AS base
WORKDIR /app
Expand Down
14 changes: 7 additions & 7 deletions resolved.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ resolved = [
"original_rule_class": "local_repository",
"original_attributes": {
"name": "bazel_tools",
"path": "/root/.cache/bazel/_bazel_root/install/ee8d7e4b6774884ed2cd0aece6fc9fda/embedded_tools",
"path": "/root/.cache/bazel/_bazel_root/install/64841bf12de13c7518c7ada0994bafe2/embedded_tools",
},
"native": "local_repository(name = \"bazel_tools\", path = __embedded_dir__ + \"/\" + \"embedded_tools\")",
},
Expand Down Expand Up @@ -261,13 +261,13 @@ resolved = [
"rule_class": "@bazel_upgradable//:rule.bzl%upgradable_repository",
"attributes": {
"urls": [
"https://github.com/glfw/glfw/archive/bfd9eaf0926320493f5257e9d57bf5d4f3c5cc53.tar.gz",
"https://github.com/glfw/glfw/archive/81d762bf66de89343eea400bd37efda161272535.tar.gz",
],
"sha256": "e6f96ecd4599d320201c4c366a345fef22a321a184db776e0bae75e0a18db30c",
"sha256": "e78464328273d810ded3c1dd8b6cec4840080e554d07934f7ecec71ed278889f",
"netrc": "",
"auth_patterns": {},
"canonical_id": "",
"strip_prefix": "glfw-bfd9eaf0926320493f5257e9d57bf5d4f3c5cc53",
"strip_prefix": "glfw-81d762bf66de89343eea400bd37efda161272535",
"type": "tar.gz",
"patches": [],
"patch_tool": "",
Expand All @@ -285,7 +285,7 @@ resolved = [
"tag": "",
"name": "glfw",
},
"output_tree_hash": "9d7b5a61ead13d2bd09f4cdefb561d9e9f27fa234746051b25e14b90d57fb4c3",
"output_tree_hash": "4b56c95d240132034ba6f6016e8763b9aabd101aabf9ea500f8a432da64ceb8e",
},
],
},
Expand Down Expand Up @@ -1440,7 +1440,7 @@ resolved = [
"original_rule_class": "local_repository",
"original_attributes": {
"name": "platforms",
"path": "/root/.cache/bazel/_bazel_root/install/ee8d7e4b6774884ed2cd0aece6fc9fda/platforms",
"path": "/root/.cache/bazel/_bazel_root/install/64841bf12de13c7518c7ada0994bafe2/platforms",
},
"native": "local_repository(name = \"platforms\", path = __embedded_dir__ + \"/\" + \"platforms\")",
},
Expand All @@ -1461,7 +1461,7 @@ resolved = [
"generator_function": "cc_configure",
"generator_location": None,
},
"output_tree_hash": "262e5fda2411686171d83c81b704cc63da51a0649db2ac865650e134e446fe41",
"output_tree_hash": "eb62b32df8c049307a45bb97e8e4c217294a49e1b906e745cb71e59058034730",
},
],
},
Expand Down
2 changes: 1 addition & 1 deletion snap/snapcraft.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: voidstar
version: v1.37.0 # FIXME: 'git'
version: v1.38.0 # FIXME: 'git'
summary: void* casts files onto 2D/3D colored spaces for your mind blowing needs # 79 char long summary
description: |
Usage:
Expand Down
1 change: 1 addition & 0 deletions voidstar/arguments.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include <cassert>
#include <iostream>
#include <limits>

#ifdef _WIN32
#include "getopt.h"
Expand Down
1 change: 1 addition & 0 deletions voidstar/loaders/file.cc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include <fstream>
#include <limits>

#include "voidstar/loaders/loader.h"
#include "voidstar/loaders/uri.h"
Expand Down

0 comments on commit 32096f4

Please sign in to comment.