Changeset 11338:2006c70024f2 in orange


Ignore:
Timestamp:
02/20/13 14:23:17 (14 months ago)
Author:
astaric
Branch:
default
Message:

Fixes for compiling with clang.

export CPPFLAGS=-Wno-address-of-temporary should no longer be needed.

Location:
source
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • source/orange/assoc.hpp

    r10960 r11338  
    276276 
    277277  TAssociationRulesSparseInducer(float asupp=0.3, float aconf=0, int awei=0); 
    278   TSparseItemsetTree *TAssociationRulesSparseInducer::buildTree(PExampleGenerator examples, const int &weightID, long &i, float &fullWeight); 
     278  TSparseItemsetTree *buildTree(PExampleGenerator examples, const int &weightID, long &i, float &fullWeight); 
    279279  PAssociationRules operator()(PExampleGenerator, const int &weightID); 
    280280 
  • source/orange/examplegen.hpp

    r10960 r11338  
    151151  bool operator != (const TExampleIterator &other); 
    152152 
    153   inline TExampleIterator &TExampleIterator::operator ++ () 
     153  inline TExampleIterator &operator ++ () 
    154154  { if (!example) 
    155155      raiseErrorWho("exampleIterator", "out of range"); 
  • source/orange/hclust.hpp

    r9026 r11338  
    8080 
    8181private: 
    82     TClusterW *THierarchicalClustering::merge_CompleteLinkage(TClusterW **clusters, float *callbackMilestones); 
    83     TClusterW *THierarchicalClustering::merge_SingleLinkage(TClusterW **clusters, float *callbackMilestones); 
    84     TClusterW *THierarchicalClustering::merge_AverageLinkage(TClusterW **clusters, float *callbackMilestones); 
     82    TClusterW *merge_CompleteLinkage(TClusterW **clusters, float *callbackMilestones); 
     83    TClusterW *merge_SingleLinkage(TClusterW **clusters, float *callbackMilestones); 
     84    TClusterW *merge_AverageLinkage(TClusterW **clusters, float *callbackMilestones); 
    8585    // Average linkage also computes Ward's linkage 
    8686 
  • source/orange/pythonvars.hpp

    r6531 r11338  
    4141  TPythonValue(PyObject *value); 
    4242 
    43   TPythonValue &TPythonValue::operator =(const TPythonValue &other); 
     43  TPythonValue &operator =(const TPythonValue &other); 
    4444 
    4545  ~TPythonValue(); 
  • source/orangeom/pathfinder.hpp

    r6925 r11338  
    135135     * @param result: The resulting matrix 
    136136     */ 
    137     void TPathfinder::op(const Matrix &A, const Matrix &B, Matrix &result) const; 
     137    void op(const Matrix &A, const Matrix &B, Matrix &result) const; 
    138138     
    139139    /** 
  • source/pyxtract/pyxtract.py

    r10478 r11338  
    810810    externsfile.write('#define PyOr%s_Check(op) PyObject_TypeCheck(op, (PyTypeObject *)&PyOr%s_Type)\n' % (type, type)) 
    811811    if classdefs[type].datastructure == "TPyOrange": 
    812       externsfile.write('#define PyOrange_As%s(op) (*(GCPtr< T%s > *)(void *)(&PyOrange_AS_Orange(op)))\n' % (type, type)) 
     812      externsfile.write('#define PyOrange_As%s(op) (static_cast<GCPtr< T%s > >(PyOrange_AS_Orange(op)))\n' % (type, type)) 
    813813      externsfile.write('\n') 
    814814 
Note: See TracChangeset for help on using the changeset viewer.