Explorar o código

Fix compile errors on Tilera/Mac versions of gcc

Default gcc installed with XCode on OSX Lion is
i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1
(Based on Apple Inc. build 5658) (LLVM build 2336.1.00)

This seems to have some issues with virtual functions that have ... params
if overridden, if base class is not the first. Easiest way to avoid these
issues (which also affected Tilera build) is to swap the order of the base
classes in a couple of cases.

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman %!s(int64=13) %!d(string=hai) anos
pai
achega
a287dbb9c9
Modificáronse 2 ficheiros con 2 adicións e 2 borrados
  1. 1 1
      ecl/hql/hqlparse.cpp
  2. 1 1
      system/jlib/jlog.ipp

+ 1 - 1
ecl/hql/hqlparse.cpp

@@ -78,7 +78,7 @@ public:
 
 
 // =========================== CTemplateContext =========================================
 // =========================== CTemplateContext =========================================
 
 
-class CTemplateContext : public CInterface, implements ITemplateContext
+class CTemplateContext : implements ITemplateContext, public CInterface
 {
 {
     IXmlScope* m_xmlScope;
     IXmlScope* m_xmlScope;
     int m_startLine,m_startCol;
     int m_startLine,m_startCol;

+ 1 - 1
system/jlib/jlog.ipp

@@ -696,7 +696,7 @@ class DropLogMsg;
 
 
 // Implementation of logging manager
 // Implementation of logging manager
 
 
-class CLogMsgManager : public CInterface, implements ILogMsgManager
+class CLogMsgManager : public ILogMsgManager, public CInterface
 {
 {
 private:
 private:
     class MsgProcessor : public Thread
     class MsgProcessor : public Thread