Skip to content

Instantly share code, notes, and snippets.

@dilworks
Created April 29, 2019 21:25
Show Gist options
  • Save dilworks/6dd7caf8d70d46e98ba39dd808a66b05 to your computer and use it in GitHub Desktop.
Save dilworks/6dd7caf8d70d46e98ba39dd808a66b05 to your computer and use it in GitHub Desktop.
Build Dolphin with clang-3.8 (Debian Stable)
diff --git a/Source/Core/Common/GL/GLInterface/EGL.cpp b/Source/Core/Common/GL/GLInterface/EGL.cpp
index 93a60ca9d8..9f299550fb 100644
--- a/Source/Core/Common/GL/GLInterface/EGL.cpp
+++ b/Source/Core/Common/GL/GLInterface/EGL.cpp
@@ -289,7 +289,7 @@ std::unique_ptr<GLContext> GLContextEGL::CreateSharedContext()
return nullptr;
}
- return new_context;
+ return std::move(new_context);
}
bool GLContextEGL::CreateWindowSurface()
diff --git a/Source/Core/Common/GL/GLInterface/GLX.cpp b/Source/Core/Common/GL/GLInterface/GLX.cpp
index 78814db80f..b509d41d4b 100644
--- a/Source/Core/Common/GL/GLInterface/GLX.cpp
+++ b/Source/Core/Common/GL/GLInterface/GLX.cpp
@@ -248,7 +248,7 @@ std::unique_ptr<GLContext> GLContextGLX::CreateSharedContext()
}
XSetErrorHandler(oldHandler);
- return new_context;
+ return std::move(new_context);
}
bool GLContextGLX::CreateWindowSurface(Window window_handle)
diff --git a/Source/Core/DolphinQt/Config/VerifyWidget.cpp b/Source/Core/DolphinQt/Config/VerifyWidget.cpp
index dd96c6ba9b..ce6ccde7a5 100644
--- a/Source/Core/DolphinQt/Config/VerifyWidget.cpp
+++ b/Source/Core/DolphinQt/Config/VerifyWidget.cpp
@@ -74,7 +74,7 @@ std::pair<QCheckBox*, QLineEdit*> VerifyWidget::AddHashLine(QFormLayout* layout,
layout->addRow(text, hbox_layout);
- return std::pair(checkbox, line_edit);
+ return std::make_pair(checkbox, line_edit);
}
void VerifyWidget::ConnectWidgets()
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment