Revision 1613

trunk/tests/xml/admodel.h (revision 1613)
73 73
#include <cifstrem.h>
74 74

  
75 75
#include <adstring.hpp>
76
//#include "ADMB_XMLDoc.h"
77 76
class init_xml_doc;
78 77

  
79 78
#if defined(UNIXKLUDGE)
......
141 140
  exception * err;
142 141
  AD_matherror(exception * _err) : err(_err) {;}
143 142
#endif
144
#if defined (__MSVC32__)
143
#if defined (_MSC_VER)
145 144
  _exception * err;
146 145
  AD_matherror(_exception * _err) : err(_err) {;}
147 146
#endif
......
259 258
  named_dvariable& operator = (CGNU_DOUBLE m);
260 259
  friend class model_parameters;
261 260
};
262
/*
263
class init_xml_doc : public ADMB_XMLDoc, public model_name_tag
264
{
265
public:
266
  init_xml_doc(void) : ADMB_XMLDoc(), model_name_tag() {;}
267
  void allocate(const char * s);
268
  friend class model_parameters;
269
};
270
*/
271 261

  
272

  
273 262
/**
274 263
 * Description not yet available.
275 264
 * \param
......
758 747
  int current_size;
759 748
  int current;
760 749
  void resize(void);
761
  void add_to_list(void * p);
750
  void add_to_list(void* p);
762 751
public:
763 752
  ~adlist_ptr();
764 753
  pinitial_params  & operator [] (int i);
......
1149 1138
  void allocate(int phase_start=1,const char *s="UNNAMED");
1150 1139
  void allocate(const char *s="UNNAMED");
1151 1140
  void allocate(init_xml_doc&, const char *s="UNNAMED");
1152

  
1153 1141
  friend class model_parameters;
1154 1142
  friend class param_init_number_vector;
1155 1143
  param_init_number();
......
1657 1645
  double * pd;
1658 1646
  void allocate(double * pd,int imin,int imax,const char * ="UNNAMED");
1659 1647
  void allocate(double *pd, int imin, const ivector& imax, const char * ="UNNAMED");
1660

  
1661 1648
  virtual ~dll_data_vector();
1662 1649
  dll_data_vector& operator = (const dvector& x);
1663 1650
  dll_data_vector& operator = (const double& x);
......
2827 2814

  
2828 2815
int withinbound(int lb,int n,int ub);
2829 2816

  
2830
#if defined(__MSVC32__)
2817
#if defined(_MSC_VER)
2831 2818
#  if defined(min)
2832 2819
#    undef min
2833 2820
#  endif
trunk/tests/xml/ADMB_XMLDoc.h (revision 1613)
9 9
#define __ADMB_XMLDoc__
10 10

  
11 11
#include <fvar.hpp>
12
#include <admodel.h>
12 13

  
13 14
#include <libxml/tree.h>
14 15
#include <libxml/parser.h>
......
17 18

  
18 19
using namespace std;
19 20

  
20
// forward declarations to avoid circular includes caused by
21
#include <admodel.h>
22
/*
23
class data_vector;
24
class data_matrix;
25
class named_dvariable;
26
class named_dvar_vector;
27
class named_dvar_matrix;
28
class param_init_bounded_number;
29
class param_init_bounded_vector;
30
class objective_function_value;
31
class initial_params;
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff