Merge branch 'master' into epoxy

[movit] / sandbox_effect.h

diff --git a/sandbox_effect.h b/sandbox_effect.h
index 4443ff7d29afc85126ca043b83e9679b55b76d48..25c79920109cbbdbf1d0418c41566df863a037df 100644 (file)
--- a/sandbox_effect.h
+++ b/sandbox_effect.h
@@ -1,5 +1,5 @@
-#ifndef _SANDBOX_EFFECT_H
-#define _SANDBOX_EFFECT_H 1
+#ifndef _MOVIT_SANDBOX_EFFECT_H
+#define _MOVIT_SANDBOX_EFFECT_H 1
 
 // This effect, by default, does nothing.
 //
@@ -8,8 +8,13 @@
 // throwaway code. When you're happy, you can do a bit of search and replace
 // to give it a proper name and its own place in the build system.
 
+#include <epoxy/gl.h>
+#include <string>
+
 #include "effect.h"
 
+namespace movit {
+
 class SandboxEffect : public Effect {
 public:
        SandboxEffect();
@@ -22,4 +27,6 @@ private:
        float parm;
 };
 
-#endif // !defined(_SANDBOX_EFFECT_H)
+}  // namespace movit
+
+#endif // !defined(_MOVIT_SANDBOX_EFFECT_H)