Skip to content

Commit a43aca3

Browse files
committed
Update cpr
1 parent be00eea commit a43aca3

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ project(ComputerAlgebraSystem
55
LANGUAGES CXX)
66

77
set(CMAKE_CXX_STANDARD 20)
8-
set(CMAKE_CXX_EXTENSIONS OFF)
8+
set(CMAKE_CXX_EXTENSIONS OFF) # Don't use compiler extensions so we have a portable codebase.
99
set(CMAKE_CXX_STANDARD_REQUIRED ON)
1010
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
1111

cas/src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ include(FetchContent)
55

66
FetchContent_Declare(cpr
77
GIT_REPOSITORY https://github.com/libcpr/cpr.git
8-
GIT_TAG f88fd7737de3e640c61703eb57a0fa0ce00c60cd)
8+
GIT_TAG 2553fc41450301cd09a9271c8d2c3e0cf3546b73)
99
FetchContent_MakeAvailable(cpr)
1010

1111
set(CPR_BUILD_TESTS OFF CACHE BOOL "Build the tests" FORCE)

cas/src/core/data/VariableMap.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ VariableMapIterator& VariableMapIterator::operator++() {
248248
if (letter == 'z' + 1) {
249249
letter = 'A';
250250
}
251-
} while ((letter >= 'a' && letter <= 'z' || letter >= 'A' && letter <= 'Z') &&
251+
} while (((letter >= 'a' && letter <= 'z') || (letter >= 'A' && letter <= 'Z')) &&
252252
!variableMap.contains(letter));
253253

254254
return *this;

src/render/metal/Window.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
class Window {
3131
public:
32-
explicit Window(const char* title, id<MTLDevice> device, Grid& grid) : device(device), grid(grid), title(title) {
32+
explicit Window(const char* title, id<MTLDevice> device, Grid& grid) : title(title), device(device), grid(grid) {
3333
glfwSetErrorCallback([](int error, const char* description) {
3434
printf("Glfw Error %d: %s\n", error, description);
3535
});

src/render/metal/main.mm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#include <memory>
22

3+
#include "cas/data/VariableMap.h"
4+
35
#include "Grid.h"
46
#include "Surface.h"
57
#include "Window.h"
68

7-
#include "cas/data/VariableMap.h"
8-
99
#import <Metal/Metal.h>
1010
#import <MetalKit/MetalKit.h>
1111
#import <QuartzCore/QuartzCore.h>
@@ -28,10 +28,10 @@
2828

2929
MTLVertexDescriptor* getVertexDescriptor() {
3030
MTLVertexDescriptor* vertexDescriptor = [MTLVertexDescriptor new];
31-
vertexDescriptor.attributes[0].format = MTLVertexFormatFloat3;// position
31+
vertexDescriptor.attributes[0].format = MTLVertexFormatFloat3; // position
3232
vertexDescriptor.attributes[0].offset = 0;
3333
vertexDescriptor.attributes[0].bufferIndex = 0;
34-
vertexDescriptor.attributes[1].format = MTLVertexFormatFloat4;// color
34+
vertexDescriptor.attributes[1].format = MTLVertexFormatFloat4; // color
3535
vertexDescriptor.attributes[1].offset = sizeof(simd::float3);
3636
vertexDescriptor.attributes[1].bufferIndex = 0;
3737
vertexDescriptor.layouts[0].stride = sizeof(Vertex);

0 commit comments

Comments
 (0)