Skip to content

Commit

Permalink
Fixed ambiguity between std::byte and byte in rpcndr.h
Browse files Browse the repository at this point in the history
Fixes libsdl-org#8911

(cherry picked from commit a71f99c)
(cherry picked from commit 9196584)
  • Loading branch information
slouken committed Jan 23, 2024
1 parent 9120fbd commit e3fb974
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
6 changes: 0 additions & 6 deletions src/core/winrt/SDL_winrtapp_direct3d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@
*/
#include "../../SDL_internal.h"

/* Standard C++11 includes */
#include <functional>
#include <string>
#include <sstream>
using namespace std;

/* Windows includes */
#include "ppltasks.h"
using namespace concurrency;
Expand Down
4 changes: 1 addition & 3 deletions src/video/winrt/SDL_winrtvideo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,8 @@
*/

/* Standard C++11 includes */
#include <functional>
#include <string>
#include <sstream>
using namespace std;
#include <string>

/* Windows includes */
#include <agile.h>
Expand Down

0 comments on commit e3fb974

Please sign in to comment.