Skip to content
This repository was archived by the owner on Feb 2, 2026. It is now read-only.

Linux64 compilation fixes. fix #11 #13

Closed
illwieckz wants to merge 1 commit into from
Closed

Linux64 compilation fixes. fix #11 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion crnlib/crn_timer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ namespace crnlib
timer m_tm;

public:
inline timed_scope(char* pName = "timed_scope") : m_pName(pName) { m_tm.start(); }
inline timed_scope(const char* pName = "timed_scope") : m_pName(pName) { m_tm.start(); }

inline double get_elapsed_secs() const { return m_tm.get_elapsed_secs(); }
inline double get_elapsed_ms() const { return m_tm.get_elapsed_ms(); }
Expand Down
2 changes: 1 addition & 1 deletion crnlib/crn_vector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace crnlib
if (m_capacity >= min_new_capacity)
return true;

size_t new_capacity = min_new_capacity;
ptr_bits_t new_capacity = min_new_capacity;
if ((grow_hint) && (!math::is_power_of_2(new_capacity)))
new_capacity = math::next_pow2(new_capacity);

Expand Down
4 changes: 2 additions & 2 deletions inc/crn_decomp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,8 +373,8 @@ namespace crnd
enum eClear { cClear };

const uint32 cIntBits = 32U;
#ifdef _WIN64

#if defined(_WIN64) || defined(_LP64)
typedef uint64 ptr_bits;
#else
#ifdef __x86_64__
Expand Down