← Back to branch summary

~ubuntu-branches/ubuntu/trusty/r-cran-rcpparmadillo/trusty-proposed

« back to all changes in this revision

Viewing changes to inst/include/armadillo_bits/eglue_core_meat.hpp

  • Committer: Package Import Robot
  • Author(s): Dirk Eddelbuettel
  • Date: 2013-07-31 16:40:01 UTC
  • mfrom: (1.1.5)
  • Revision ID: package-import@ubuntu.com-20130731164001-h9t7espn2nh9wf9p
Tags: 0.3.900.7-1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
inst/include/armadillo_bits/eglue_core_meat.hpp
174
174
    {
175
175
    const uword n_elem = (Proxy<T1>::is_fixed || Proxy<T2>::is_fixed) ? x.get_n_elem() : out.n_elem;
176
176
    
177
 
    if(memory::is_aligned(out_mem))
 
177
    //if( memory::is_aligned(out_mem) )
 
178
    if( memory::is_aligned(out_mem) && ((Proxy<T1>::is_fixed && Proxy<T2>::is_fixed) ? (x.get_n_elem() >= 32) : true) )
178
179
      {
179
180
      memory::mark_as_aligned(out_mem);
180
181
      
192
193
        {
193
194
        typename Proxy<T1>::ea_type P1 = x.P1.get_ea();
194
195
        typename Proxy<T2>::ea_type P2 = x.P2.get_ea();
195
 
    
 
196
        
196
197
             if(is_same_type<eglue_type, eglue_plus >::value == true) { arma_applier_1u(=, +); }
197
198
        else if(is_same_type<eglue_type, eglue_minus>::value == true) { arma_applier_1u(=, -); }
198
199
        else if(is_same_type<eglue_type, eglue_div  >::value == true) { arma_applier_1u(=, /); }