Make a pow() call unambiguous.

[movit] / sandbox_effect.cpp

diff --git a/sandbox_effect.cpp b/sandbox_effect.cpp
index 3f24a42503c9fec5190e9f72b2a3c6d8b683929f..840611eb51f958efb269e4ad29096c5625fa8cbb 100644 (file)
--- a/sandbox_effect.cpp
+++ b/sandbox_effect.cpp
@@ -1,22 +1,22 @@
-#include <math.h>
-#include <assert.h>
 #include <GL/glew.h>
 
 #include "sandbox_effect.h"
 #include "util.h"
 
+using namespace std;
+
 SandboxEffect::SandboxEffect()
        : parm(0.0f)
 {
        register_float("parm", &parm);
 }
 
-std::string SandboxEffect::output_fragment_shader()
+string SandboxEffect::output_fragment_shader()
 {
        return read_file("sandbox_effect.frag");
 }
 
-void SandboxEffect::set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num)
+void SandboxEffect::set_gl_state(GLuint glsl_program_num, const string &prefix, unsigned *sampler_num)
 {
        Effect::set_gl_state(glsl_program_num, prefix, sampler_num);