Merge branch 'master' into epoxy

[movit] / mirror_effect.cpp

diff --git a/mirror_effect.cpp b/mirror_effect.cpp
index 7c9875a8153a1fd5404784b1bedd2a65b86d22f3..d3c7a83152211925468eea21394e8e482935b38c 100644 (file)
--- a/mirror_effect.cpp
+++ b/mirror_effect.cpp
@@ -1,11 +1,17 @@
 #include "mirror_effect.h"
 #include "util.h"
 
+using namespace std;
+
+namespace movit {
+
 MirrorEffect::MirrorEffect()
 {
 }
 
-std::string MirrorEffect::output_fragment_shader()
+string MirrorEffect::output_fragment_shader()
 {
        return read_file("mirror_effect.frag");
 }
+
+}  // namespace movit