blob: 09e2df54fca957343572ba346f91ff4f126e844d (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
From 31181465d5c8ba87efa6450c149dc00acffe0f6d Mon Sep 17 00:00:00 2001
From: Jonas Minnberg <sasq64@gmail.com>
Date: Tue, 17 May 2016 10:38:42 +0200
Subject: [PATCH] Two missing std specifiers
---
demofx/Scroller.h | 2 +-
src/ChipMachine.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/demofx/Scroller.h b/demofx/Scroller.h
index b17e286..46d8e2c 100644
--- a/demofx/Scroller.h
+++ b/demofx/Scroller.h
@@ -15,7 +15,7 @@ class Scroller : public Effect {
program = grappix::get_program(grappix::TEXTURED_PROGRAM).clone();
grappix::Resources::getInstance().load<std::string>(utils::File::getCacheDir() / "sine_shader.glsl",
- [=](std::shared_ptr<string> source) {
+ [=](std::shared_ptr<std::string> source) {
try {
program.setFragmentSource(*source);
} catch(grappix::shader_exception &e) {
diff --git a/src/ChipMachine.h b/src/ChipMachine.h
index 35b9623..1515e9f 100644
--- a/src/ChipMachine.h
+++ b/src/ChipMachine.h
@@ -223,7 +223,7 @@ class ChipMachine {
//
- string currentNextPath;
+ std::string currentNextPath;
SongInfo currentInfo;
SongInfo dbInfo;
int currentTune = 0;
|