Revision 1878

trunk/src/nh99/admodel.h (revision 1878)
54 54

  
55 55
#define BIG_INIT_PARAMS
56 56

  
57
#if !defined(linux)
58
#  define BORCAST (prevariable&)
59
#else
60
#  define BORCAST
61
#endif
62 57
#if defined(USE_LAPLACE)
63 58
  class laplace_approximation_calculator;
64 59
  void cleanup_laplace_stuff(laplace_approximation_calculator *);
......
2537 2532
#if defined(OPT_LIB)
2538 2533
   param_init_vector& operator [] (int i) { return v[i];}
2539 2534
   param_init_vector& operator () (int i) { return v[i];}
2540
   prevariable operator () (int i,int j) { return BORCAST(v[i][j]);}
2535
   prevariable operator () (int i,int j) { return v[i][j];}
2541 2536
#else
2542 2537
   param_init_vector& operator [] (int i);
2543 2538
   param_init_vector& operator () (int i);
......
2578 2573
#if defined(OPT_LIB)
2579 2574
   param_init_bounded_vector& operator [] (int i) { return v[i];}
2580 2575
   param_init_bounded_vector& operator () (int i) { return v[i];}
2581
   prevariable operator () (int i,int j) { return BORCAST (v[i][j]);}
2576
   prevariable operator () (int i,int j) { return v[i][j];}
2582 2577
#else
2583 2578
   param_init_bounded_vector& operator [] (int i);
2584 2579
   param_init_bounded_vector& operator () (int i);
......
2628 2623
   param_init_matrix& operator [] (int i) { return v[i];}
2629 2624
   param_init_matrix& operator () (int i) { return v[i];}
2630 2625
   dvar_vector& operator () (int i,int j) { return v[i][j];}
2631
   prevariable operator () (int i,int j,int k) { return BORCAST (v[i](j,k));}
2626
   prevariable operator () (int i,int j,int k) { return v[i](j,k);}
2632 2627
#else
2633 2628
   param_init_matrix& operator [] (int i);
2634 2629
   param_init_matrix& operator () (int i);
......
2683 2678
   param_init_bounded_matrix& operator [] (int i) { return v[i];}
2684 2679
   param_init_bounded_matrix& operator () (int i) { return v[i];}
2685 2680
   dvar_vector& operator () (int i,int j) { return v[i][j];}
2686
   prevariable operator () (int i,int j,int k) { return BORCAST (v[i](j,k));}
2681
   prevariable operator () (int i,int j,int k) { return v[i](j,k);}
2687 2682
#else
2688 2683
   param_init_bounded_matrix& operator [] (int i);
2689 2684
   param_init_bounded_matrix& operator () (int i);

Also available in: Unified diff