X-Git-Url: http://git.euphorik.ch/?p=GPU.git;a=blobdiff_plain;f=WCudaMSE%2FStudent_Cuda_Image%2Fsrc%2Fcpp%2Fcore%2F01_Rippling%2Fmoo%2Fhost%2FRippling.h;h=b9ea8f48ff439ad20734d4e38049331ffa99dfea;hp=0eb853ed796750d5676fa70d904c054749e26b45;hb=2fd5d915e8a9de4d957d6031d2d68088784eac3c;hpb=f2c6a4fc79746e2d5c6678699bd2ca93ffc49bcc diff --git a/WCudaMSE/Student_Cuda_Image/src/cpp/core/01_Rippling/moo/host/Rippling.h b/WCudaMSE/Student_Cuda_Image/src/cpp/core/01_Rippling/moo/host/Rippling.h index 0eb853e..b9ea8f4 100755 --- a/WCudaMSE/Student_Cuda_Image/src/cpp/core/01_Rippling/moo/host/Rippling.h +++ b/WCudaMSE/Student_Cuda_Image/src/cpp/core/01_Rippling/moo/host/Rippling.h @@ -1,8 +1,8 @@ #ifndef RIPPLING_H_ #define RIPPLING_H_ -#include "cudaTools.h" #include "Animable_I.h" +#include "cudaTools.h" #include "MathTools.h" /*----------------------------------------------------------------------*\ @@ -41,7 +41,7 @@ class Rippling: public Animable_I virtual int getW(void); virtual int getH(void); - virtual string getTitle(void); + virtual std::string getTitle(void); private: @@ -62,7 +62,7 @@ class Rippling: public Animable_I float t; //Outputs - string title; + std::string title; }; #endif