mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-06-13 22:03:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into bill/bedrock

Browse Source
This commit is contained in:
gingerBill
2026-05-05 13:57:14 +01:00
parent 44e44911c8 7788ca0242
commit 942c1bff17
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
base/runtime/core.odin
View File

@@ -636,7 +636,6 @@ Odin_Build_Mode_Type :: type_of(ODIN_BUILD_MODE)
/*
// Defined internally by the compiler
Odin_Endian_Type :: enum int {
Unknown,
Little,
Big,
}

2
core/os/dir.odin
View File

@@ -218,7 +218,7 @@ copy_directory_all :: proc(dst, src: string, dst_perm := Permissions_Default) ->
@(private)
_copy_directory_all :: proc(dst, src: string, dst_perm := Permissions_Default) -> Error {
err := make_directory(dst, dst_perm)
err := make_directory_all(dst, dst_perm)
if err != nil && err != .Exist {
return err
}

2
core/os/dir_windows.odin
View File

@@ -126,7 +126,7 @@ _read_directory_iterator_init :: proc(it: ^Read_Directory_Iterator, f: ^File) {
}
err: Error
it.impl.path, err = _cleanpath_from_buf(wpath, file_allocator())
it.impl.path, err = get_absolute_path(impl.name, file_allocator())
if err != nil {
read_directory_iterator_set_error(it, impl.name, err)
}

2
src/build_settings.cpp
View File

@@ -366,7 +366,7 @@ enum OptInFeatureFlags : u64 {
OptInFeatureFlag_IntegerDivisionByZero_AllBits,
OptInFeatureFlag_ForceTypeAssert = 1u<<6,
OptInFeatureFlag_UsingStmt = 1u<<7,
OptInFeatureFlag_UsingStmt = 1u<<7,
};
u64 get_feature_flag_from_name(String const &name) {

3
src/check_decl.cpp
View File

@@ -1909,7 +1909,8 @@ gb_internal void check_proc_group_decl(CheckerContext *ctx, Entity *pg_entity, D
ProcTypeOverloadKind kind = are_proc_types_overload_safe(p->type, q->type);
bool both_have_where_clauses = false;
if (p->decl_info->proc_lit != nullptr && q->decl_info->proc_lit != nullptr) {
if (p->decl_info != nullptr && q->decl_info != nullptr &&
p->decl_info->proc_lit != nullptr && q->decl_info->proc_lit != nullptr) {
GB_ASSERT(p->decl_info->proc_lit->kind == Ast_ProcLit);
GB_ASSERT(q->decl_info->proc_lit->kind == Ast_ProcLit);
auto pl = &p->decl_info->proc_lit->ProcLit;