Merge remote-tracking branch 'github/master' into profile-gui

[apitrace] / wrappers / gltrace_state.cpp

diff --git a/wrappers/gltrace_state.cpp b/wrappers/gltrace_state.cpp
index 796d61f37399a3060651493d79f6c48fb7b9ef99..cb8e08b1accce6b7818a55528f74809f7da1cd53 100644 (file)
--- a/wrappers/gltrace_state.cpp
+++ b/wrappers/gltrace_state.cpp
@@ -28,7 +28,11 @@
 #include <assert.h>
 
 #include <map>
+#if defined(_MSC_VER)
+#include <memory>
+#else
 #include <tr1/memory>
+#endif
 
 #include <gltrace.hpp>
 #include <os_thread.hpp>
@@ -122,15 +126,6 @@ void createContext(uintptr_t context_id)
     context_map_mutex.unlock();
 }
 
-/*
- * return true if the context has been destroyed, false otherwise. See
- * the note at releaseContext about the actual ccontext lifetime.
- */
-bool destroyContext(uintptr_t context_id)
-{
-    return releaseContext(context_id);
-}
-
 void setContext(uintptr_t context_id)
 {
     ThreadState *ts = get_ts();