← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to source/gameengine/Expressions/StringValue.h

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/Expressions/StringValue.h
25
25
{
26
26
 
27
27
        
28
 
        //PLUGIN_DECLARE_SERIAL(CStringValue,CValue)            
 
28
        //PLUGIN_DECLARE_SERIAL(CStringValue,CValue)
29
29
public:
30
30
        /// Construction / destruction
31
31
        CStringValue();
32
 
        CStringValue (const char *txt, const char *name , AllocationTYPE alloctype = CValue::HEAPVALUE);
 
32
        CStringValue(const char *txt, const char *name, AllocationTYPE alloctype = CValue::HEAPVALUE);
33
33
 
34
34
        virtual ~CStringValue() {}
35
35
        /// CValue implementation
45
45
        virtual PyObject*       ConvertValueToPython() {
46
46
                return PyUnicode_From_STR_String(m_strString);
47
47
        }
48
 
#endif // WITH_PYTHON
 
48
#endif  /* WITH_PYTHON */
49
49
 
50
50
private:
51
51
        // data member
53
53
 
54
54
 
55
55
#ifdef WITH_CXX_GUARDEDALLOC
56
 
public:
57
 
        void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CStringValue"); }
58
 
        void operator delete( void *mem ) { MEM_freeN(mem); }
 
56
        MEM_CXX_CLASS_ALLOC_FUNCS("GE:CStringValue")
59
57
#endif
60
58
};
61
59
 
62
 
#endif
63
 
 
 
60
#endif  /* __STRINGVALUE_H__ */