Merge remote-tracking branch 'upstream/v1.3.x'

mdboom · mdboom · commit 9b00f1c89e3c · 2013-10-30T09:59:18.000-04:00
diff --git a/src/ft2font.h b/src/ft2font.h
@@ -81,7 +81,7 @@ class Glyph : public Py::PythonClass<Glyph>
 {
 public:
     Glyph(Py::PythonClassInstance *self, Py::Tuple &args, Py::Dict &kwds) :
-        Py::PythonClass<Glyph>::PythonClass(self, args, kwds) { }
+        Py::PythonClass<Glyph>(self, args, kwds) { }
     virtual ~Glyph();
     static Py::PythonClassObject<Glyph> factory(const FT_Face&, const FT_Glyph&, size_t, long);
     int setattro(const Py::String &name, const Py::Object &value);

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ class Glyph : public Py::PythonClass<Glyph>`
`81`	`81`	`{`
`82`	`82`	`public:`
`83`	`83`	`Glyph(Py::PythonClassInstance *self, Py::Tuple &args, Py::Dict &kwds) :`
`84`		`- Py::PythonClass<Glyph>::PythonClass(self, args, kwds) { }`
	`84`	`+ Py::PythonClass<Glyph>(self, args, kwds) { }`
`85`	`85`	`virtual ~Glyph();`
`86`	`86`	`static Py::PythonClassObject<Glyph> factory(const FT_Face&, const FT_Glyph&, size_t, long);`
`87`	`87`	`int setattro(const Py::String &name, const Py::Object &value);`