• R/O
  • SSH
  • HTTPS

adp: Commit


Commit MetaInfo

Revision291 (tree)
Time2012-06-06 18:31:12
Authorohfuji

Log Message

gcc コンパイルエラー

Change Summary

Incremental Difference

--- trunk/adp_unify.cpp (revision 290)
+++ trunk/adp_unify.cpp (revision 291)
@@ -157,12 +157,12 @@
157157 bool PInteger::unify(const PEVeriable &horn, ExecContextRoot *c) const { return vunify(horn, *this, c, horn.vl, c->gl); }
158158
159159 /*************************************** PList ******************************************/
160-static inline bool PList_unify(const PList &goal, const PNil &horn, ExecContextRoot *c, VLocal *glocal, VLocal *hlocal)
160+inline bool PList_unify(const PList &goal, const PNil &horn, ExecContextRoot *c, VLocal *glocal, VLocal *hlocal)
161161 {
162162 if ( typeid(*goal.lvalue) == typeid(PNil) && typeid(*goal.rvalue) == typeid(PNil) ) return true;
163163 return false;
164164 }
165-static inline bool PList_unify(const PList &goal, const PList &horn, ExecContextRoot *c, VLocal *glocal, VLocal *hlocal)
165+inline bool PList_unify(const PList &goal, const PList &horn, ExecContextRoot *c, VLocal *glocal, VLocal *hlocal)
166166 {
167167 if ( horn.lvalue->unify( *goal.lvalue, c, hlocal, glocal) && horn.rvalue->unify( *goal.rvalue, c, hlocal, glocal) ) return true;
168168 return false;
@@ -181,7 +181,7 @@
181181
182182
183183 /*************************************** PArray ******************************************/
184-static inline bool PArray_unify(const PArray &goal, const PArray &horn, ExecContextRoot *c, VLocal *glocal, VLocal *hlocal)
184+inline bool PArray_unify(const PArray &goal, const PArray &horn, ExecContextRoot *c, VLocal *glocal, VLocal *hlocal)
185185 {
186186 size_t gsiz = goal.value.size();
187187 size_t hsiz = horn.value.size();
@@ -243,7 +243,7 @@
243243 bool PArray::unify(const PEVeriable &horn, ExecContextRoot *c) const { return vunify_getval(horn, *this, c, horn.vl, c->gl); }
244244
245245 /*************************************** PPredicate ******************************************/
246-static inline bool PPredicate_unify(const PPredicate &goal, const PPredicate &horn, ExecContextRoot *c, VLocal *glocal, VLocal *hlocal)
246+inline bool PPredicate_unify(const PPredicate &goal, const PPredicate &horn, ExecContextRoot *c, VLocal *glocal, VLocal *hlocal)
247247 {
248248 // 呼び出し側(goal)がnamespaceを指定した場合、namespaceが一致している必要がある。
249249 if ( !goal.nspace.empty() && strcmp( horn.nspace.c_str(), goal.nspace.c_str()) != 0 ) { return false; }
--- trunk/adp.cpp (revision 290)
+++ trunk/adp.cpp (revision 291)
@@ -23,12 +23,12 @@
2323
2424 // 定数
2525 #ifdef ___X64____
26-#define VERSION_TEXT "ADP Ver 0.82.0290 X64 (http://www.adp.la/)\nCopyright (C) 2010-2012 Katsuhisa Ohfuji. This progman is distributed under GPL.\n"
26+#define VERSION_TEXT "ADP Ver 0.82.0291 X64 (http://www.adp.la/)\nCopyright (C) 2010-2012 Katsuhisa Ohfuji. This progman is distributed under GPL.\n"
2727 #else
2828 #if _WIN32
29-#define VERSION_TEXT "ADP Ver 0.82.0290 x86 (http://www.adp.la/)\nCopyright (C) 2010-2012 Katsuhisa Ohfuji. This progman is distributed under GPL.\n"
29+#define VERSION_TEXT "ADP Ver 0.82.0291 x86 (http://www.adp.la/)\nCopyright (C) 2010-2012 Katsuhisa Ohfuji. This progman is distributed under GPL.\n"
3030 #else
31-#define VERSION_TEXT "ADP Ver 0.82.0290 (http://www.adp.la/)\nCopyright (C) 2010-2012 Katsuhisa Ohfuji. This progman is distributed under GPL.\n"
31+#define VERSION_TEXT "ADP Ver 0.82.0291 (http://www.adp.la/)\nCopyright (C) 2010-2012 Katsuhisa Ohfuji. This progman is distributed under GPL.\n"
3232 #endif
3333 #endif
3434
Show on old repository browser