File: vc7Include.patch

package info (click to toggle)
gccxml 0.9.0%2Bcvs20100501-2
  • links: PTS
  • area: main
  • in suites: squeeze
  • size: 79,132 kB
  • ctags: 73,371
  • sloc: ansic: 751,436; cpp: 34,175; asm: 26,833; sh: 5,077; makefile: 4,696; lex: 589; awk: 566; perl: 334; yacc: 271; pascal: 86; python: 29
file content (1139 lines) | stat: -rw-r--r-- 29,284 bytes parent folder | download | duplicates (3)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
Index: assert.h
===================================================================
RCS file: /cvsroot/GxInclude/Vc7/Include/assert.h,v
retrieving revision 1.1
retrieving revision 1.3
diff -c -3 -p -r1.1 -r1.3
*** assert.h	1 Nov 2002 14:00:28 -0000	1.1
--- assert.h	27 Jan 2006 14:16:50 -0000	1.3
*************** _CRTIMP void __cdecl _assert(void *, voi
*** 53,58 ****
  }
  #endif
  
! #define assert(exp) (void)( (exp) || (_assert(#exp, __FILE__, __LINE__), 0) )
  
  #endif  /* NDEBUG */
--- 53,58 ----
  }
  #endif
  
! #define assert(exp)     ((void)0)
  
  #endif  /* NDEBUG */
Index: deque
===================================================================
RCS file: /cvsroot/GxInclude/Vc7/Include/deque,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -3 -p -r1.1 -r1.2
*** deque	1 Nov 2002 14:00:28 -0000	1.1
--- deque	21 Oct 2007 19:58:47 -0000	1.2
*************** public:
*** 245,253 ****
  			size_type _Block = _Myoff / _DEQUESIZ;
  			size_type _Off = _Myoff - _Block * _DEQUESIZ;
  
! 			if (_Mydeque->_Mapsize <= _Block)
! 				_Block -= _Mydeque->_Mapsize;
! 			return ((_Mydeque->_Map)[_Block][_Off]);
  			}
  
  		_Tptr operator->() const
--- 245,253 ----
  			size_type _Block = _Myoff / _DEQUESIZ;
  			size_type _Off = _Myoff - _Block * _DEQUESIZ;
  
! 			if (this->_Mydeque->_Mapsize <= _Block)
! 				_Block -= this->_Mydeque->_Mapsize;
! 			return ((this->_Mydeque->_Map)[_Block][_Off]);
  			}
  
  		_Tptr operator->() const
*************** public:
*** 787,793 ****
  
  	void swap(_Myt& _Right)
  		{	// exchange contents with _Right
! 		if (_Alval == _Right._Alval)
  			{	// same allocator, swap control information
  			std::swap(_Map, _Right._Map);
  			std::swap(_Mapsize, _Right._Mapsize);
--- 787,793 ----
  
  	void swap(_Myt& _Right)
  		{	// exchange contents with _Right
! 		if (this->_Alval == _Right._Alval)
  			{	// same allocator, swap control information
  			std::swap(_Map, _Right._Map);
  			std::swap(_Mapsize, _Right._Mapsize);
*************** protected:
*** 891,917 ****
  		_Mapptr _Myptr = _Newmap + _Myboff;
  
  		_Myptr = _Uninitialized_copy(_Map + _Myboff,
! 			_Map + _Mapsize, _Myptr, _Almap);	// copy from initial to end
  		if (_Myboff <= _Count)
  			{	// increment greater than offset of initial block
  			_Myptr = _Uninitialized_copy(_Map,
! 				_Map + _Myboff, _Myptr, _Almap);	// copy rest of old
  			_Uninitialized_fill_n(_Myptr, _Count - _Myboff,
! 				(_Tptr)0, _Almap);	// clear suffix of new
  			_Uninitialized_fill_n(_Newmap, _Myboff,
! 				(_Tptr)0, _Almap);	// clear prefix of new
  			}
  		else
  			{	// increment not greater than offset of initial block
  			_Uninitialized_copy(_Map,
! 				_Map + _Count, _Myptr, _Almap);	// copy more old to end
  			_Myptr = _Uninitialized_copy(_Map + _Count,
! 				_Map + _Myboff, _Newmap, _Almap);	// copy rest of old
  			_Uninitialized_fill_n(_Myptr, _Count,
! 				(_Tptr)0, _Almap);	// clear rest to initial block
  			}
  
! 		_Destroy_range(_Map + _Myboff, _Map + _Mapsize, _Almap);
  		this->_Almap.deallocate(_Map, _Mapsize);	// free storage for old
  
  		_Map = _Newmap;	// point at new
--- 891,917 ----
  		_Mapptr _Myptr = _Newmap + _Myboff;
  
  		_Myptr = _Uninitialized_copy(_Map + _Myboff,
! 			_Map + _Mapsize, _Myptr, this->_Almap);	// copy from initial to end
  		if (_Myboff <= _Count)
  			{	// increment greater than offset of initial block
  			_Myptr = _Uninitialized_copy(_Map,
! 				_Map + _Myboff, _Myptr, this->_Almap);	// copy rest of old
  			_Uninitialized_fill_n(_Myptr, _Count - _Myboff,
! 				(_Tptr)0, this->_Almap);	// clear suffix of new
  			_Uninitialized_fill_n(_Newmap, _Myboff,
! 				(_Tptr)0, this->_Almap);	// clear prefix of new
  			}
  		else
  			{	// increment not greater than offset of initial block
  			_Uninitialized_copy(_Map,
! 				_Map + _Count, _Myptr, this->_Almap);	// copy more old to end
  			_Myptr = _Uninitialized_copy(_Map + _Count,
! 				_Map + _Myboff, _Newmap, this->_Almap);	// copy rest of old
  			_Uninitialized_fill_n(_Myptr, _Count,
! 				(_Tptr)0, this->_Almap);	// clear rest to initial block
  			}
  
! 		_Destroy_range(_Map + _Myboff, _Map + _Mapsize, this->_Almap);
  		this->_Almap.deallocate(_Map, _Mapsize);	// free storage for old
  
  		_Map = _Newmap;	// point at new
Index: functional
===================================================================
RCS file: /cvsroot/GxInclude/Vc7/Include/functional,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -3 -p -r1.1 -r1.2
*** functional	1 Nov 2002 14:00:28 -0000	1.1
--- functional	21 Oct 2007 19:58:47 -0000	1.2
*************** public:
*** 343,349 ****
  		}
  
  protected:
! 	_Result (__cdecl *_Pfun)(_Arg);	// the function pointer
  	};
  
  		// TEMPLATE CLASS pointer_to_binary_function
--- 343,350 ----
  		}
  
  protected:
! 	typedef _Result (__cdecl *_PfunType)(_Arg);
!         _PfunType _Pfun;  // the function pointer
  	};
  
  		// TEMPLATE CLASS pointer_to_binary_function
*************** public:
*** 366,372 ****
  		}
  
  protected:
! 	_Result (__cdecl *_Pfun)(_Arg1, _Arg2);	// the function pointer
  	};
  
  		// TEMPLATE FUNCTION ptr_fun
--- 367,374 ----
  		}
  
  protected:
! 	typedef _Result (__cdecl *_PfunType)(_Arg1, _Arg2);
!         _PfunType _Pfun;  // the function pointer
  	};
  
  		// TEMPLATE FUNCTION ptr_fun
Index: istream
===================================================================
RCS file: /cvsroot/GxInclude/Vc7/Include/istream,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -3 -p -r1.1 -r1.2
*** istream	1 Nov 2002 14:00:28 -0000	1.1
--- istream	21 Oct 2007 19:58:47 -0000	1.2
*************** public:
*** 70,76 ****
  		explicit sentry(_Myt& _Istr, bool _Noskip = false)
  			: _Sentry_base(_Istr)
  			{	// construct locking and calling _Ipfx
! 			_Ok = _Myistr._Ipfx(_Noskip);
  			}
  
  		operator bool() const
--- 70,76 ----
  		explicit sentry(_Myt& _Istr, bool _Noskip = false)
  			: _Sentry_base(_Istr)
  			{	// construct locking and calling _Ipfx
! 			_Ok = this->_Myistr._Ipfx(_Noskip);
  			}
  
  		operator bool() const
Index: limits
===================================================================
RCS file: /cvsroot/GxInclude/Vc7/Include/limits,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -3 -p -r1.1 -r1.2
*** limits	1 Nov 2002 14:00:28 -0000	1.1
--- limits	21 Oct 2007 19:58:47 -0000	1.2
*************** struct _CRTIMP2 _Num_base
*** 66,83 ****
  	_STCONS(int, radix, 0);
  	};
  
  		// TEMPLATE CLASS numeric_limits
  template<class _Ty>
  	class numeric_limits
  		: public _Num_base
  	{	// numeric limits for arbitrary type _Ty (say little or nothing)
  public:
! 	static _Ty (__cdecl min)() _THROW0()
  		{	// return minimum value
  		return (_Ty(0));
  		}
  
! 	static _Ty (__cdecl max)() _THROW0()
  		{	// return maximum value
  		return (_Ty(0));
  		}
--- 66,84 ----
  	_STCONS(int, radix, 0);
  	};
  
+ #define __GCCXML_AVOID_MACRO_EXPANSION
  		// TEMPLATE CLASS numeric_limits
  template<class _Ty>
  	class numeric_limits
  		: public _Num_base
  	{	// numeric limits for arbitrary type _Ty (say little or nothing)
  public:
! 	static _Ty __cdecl min __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return minimum value
  		return (_Ty(0));
  		}
  
! 	static _Ty __cdecl max __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return maximum value
  		return (_Ty(0));
  		}
*************** template<> class _CRTIMP2 numeric_limits
*** 154,165 ****
  public:
  	typedef char _Ty;
  
! 	static _Ty (__cdecl min)() _THROW0()
  		{	// return minimum value
  		return (CHAR_MIN);
  		}
  
! 	static _Ty (__cdecl max)() _THROW0()
  		{	// return maximum value
  		return (CHAR_MAX);
  		}
--- 155,166 ----
  public:
  	typedef char _Ty;
  
! 	static _Ty __cdecl min __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return minimum value
  		return (CHAR_MIN);
  		}
  
! 	static _Ty __cdecl max __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return maximum value
  		return (CHAR_MAX);
  		}
*************** template<> class _CRTIMP2 numeric_limits
*** 207,218 ****
  public:
  	typedef bool _Ty;
  
! 	static _Ty (__cdecl min)() _THROW0()
  		{	// return minimum value
  		return (false);
  		}
  
! 	static _Ty (__cdecl max)() _THROW0()
  		{	// return maximum value
  		return (true);
  		}
--- 208,219 ----
  public:
  	typedef bool _Ty;
  
! 	static _Ty __cdecl min __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return minimum value
  		return (false);
  		}
  
! 	static _Ty __cdecl max __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return maximum value
  		return (true);
  		}
*************** template<> class _CRTIMP2 numeric_limits
*** 260,271 ****
  public:
  	typedef signed char _Ty;
  
! 	static _Ty (__cdecl min)() _THROW0()
  		{	// return minimum value
  		return (SCHAR_MIN);
  		}
  
! 	static _Ty (__cdecl max)() _THROW0()
  		{	// return maximum value
  		return (SCHAR_MAX);
  		}
--- 261,272 ----
  public:
  	typedef signed char _Ty;
  
! 	static _Ty __cdecl min __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return minimum value
  		return (SCHAR_MIN);
  		}
  
! 	static _Ty __cdecl max __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return maximum value
  		return (SCHAR_MAX);
  		}
*************** template<> class _CRTIMP2 numeric_limits
*** 312,323 ****
  public:
  	typedef unsigned char _Ty;
  
! 	static _Ty (__cdecl min)() _THROW0()
  		{	// return minimum value
  		return (0);
  		}
  
! 	static _Ty (__cdecl max)() _THROW0()
  		{	// return maximum value
  		return (UCHAR_MAX);
  		}
--- 313,324 ----
  public:
  	typedef unsigned char _Ty;
  
! 	static _Ty __cdecl min __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return minimum value
  		return (0);
  		}
  
! 	static _Ty __cdecl max __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return maximum value
  		return (UCHAR_MAX);
  		}
*************** template<> class _CRTIMP2 numeric_limits
*** 364,375 ****
  public:
  	typedef short _Ty;
  
! 	static _Ty (__cdecl min)() _THROW0()
  		{	// return minimum value
  		return (SHRT_MIN);
  		}
  
! 	static _Ty (__cdecl max)() _THROW0()
  		{	// return maximum value
  		return (SHRT_MAX);
  		}
--- 365,376 ----
  public:
  	typedef short _Ty;
  
! 	static _Ty __cdecl min __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return minimum value
  		return (SHRT_MIN);
  		}
  
! 	static _Ty __cdecl max __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return maximum value
  		return (SHRT_MAX);
  		}
*************** template<> class _CRTIMP2 numeric_limits
*** 417,428 ****
  public:
  	typedef unsigned short _Ty;
  
! 	static _Ty (__cdecl min)() _THROW0()
  		{	// return minimum value
  		return (0);
  		}
  
! 	static _Ty (__cdecl max)() _THROW0()
  		{	// return maximum value
  		return (USHRT_MAX);
  		}
--- 418,429 ----
  public:
  	typedef unsigned short _Ty;
  
! 	static _Ty __cdecl min __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return minimum value
  		return (0);
  		}
  
! 	static _Ty __cdecl max __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return maximum value
  		return (USHRT_MAX);
  		}
*************** template<> class _CRTIMP2 numeric_limits
*** 471,482 ****
  public:
  	typedef wchar_t _Ty;
  
! 	static _Ty (__cdecl min)() _THROW0()
  		{	// return minimum value
  		return (0);
  		}
  
! 	static _Ty (__cdecl max)() _THROW0()
  		{	// return maximum value
  		return (USHRT_MAX);
  		}
--- 472,483 ----
  public:
  	typedef wchar_t _Ty;
  
! 	static _Ty __cdecl min __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return minimum value
  		return (0);
  		}
  
! 	static _Ty __cdecl max __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return maximum value
  		return (USHRT_MAX);
  		}
*************** template<> class _CRTIMP2 numeric_limits
*** 525,536 ****
  public:
  	typedef int _Ty;
  
! 	static _Ty (__cdecl min)() _THROW0()
  		{	// return minimum value
  		return (INT_MIN);
  		}
  
! 	static _Ty (__cdecl max)() _THROW0()
  		{	// return maximum value
  		return (INT_MAX);
  		}
--- 526,537 ----
  public:
  	typedef int _Ty;
  
! 	static _Ty __cdecl min __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return minimum value
  		return (INT_MIN);
  		}
  
! 	static _Ty __cdecl max __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return maximum value
  		return (INT_MAX);
  		}
*************** template<> class _CRTIMP2 numeric_limits
*** 578,589 ****
  public:
  	typedef unsigned int _Ty;
  
! 	static _Ty (__cdecl min)() _THROW0()
  		{	// return minimum value
  		return (0);
  		}
  
! 	static _Ty (__cdecl max)() _THROW0()
  		{	// return maximum value
  		return (UINT_MAX);
  		}
--- 579,590 ----
  public:
  	typedef unsigned int _Ty;
  
! 	static _Ty __cdecl min __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return minimum value
  		return (0);
  		}
  
! 	static _Ty __cdecl max __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return maximum value
  		return (UINT_MAX);
  		}
*************** template<> class _CRTIMP2 numeric_limits
*** 631,642 ****
  public:
  	typedef long _Ty;
  
! 	static _Ty (__cdecl min)() _THROW0()
  		{	// return minimum value
  		return (LONG_MIN);
  		}
  
! 	static _Ty (__cdecl max)() _THROW0()
  		{	// return maximum value
  		return (LONG_MAX);
  		}
--- 632,643 ----
  public:
  	typedef long _Ty;
  
! 	static _Ty __cdecl min __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return minimum value
  		return (LONG_MIN);
  		}
  
! 	static _Ty __cdecl max __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return maximum value
  		return (LONG_MAX);
  		}
*************** template<> class _CRTIMP2 numeric_limits
*** 684,695 ****
  public:
  	typedef unsigned long _Ty;
  
! 	static _Ty (__cdecl min)() _THROW0()
  		{	// return minimum value
  		return (0);
  		}
  
! 	static _Ty (__cdecl max)() _THROW0()
  		{	// return maximum value
  		return (ULONG_MAX);
  		}
--- 685,696 ----
  public:
  	typedef unsigned long _Ty;
  
! 	static _Ty __cdecl min __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return minimum value
  		return (0);
  		}
  
! 	static _Ty __cdecl max __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return maximum value
  		return (ULONG_MAX);
  		}
*************** template<> class _CRTIMP2 numeric_limits
*** 738,749 ****
  public:
  	typedef _LONGLONG _Ty;
  
! 	static _Ty (__cdecl min)() _THROW0()
  		{	// return minimum value
  		return (-_LLONG_MAX - _C2);
  		}
  
! 	static _Ty (__cdecl max)() _THROW0()
  		{	// return maximum value
  		return (_LLONG_MAX);
  		}
--- 739,750 ----
  public:
  	typedef _LONGLONG _Ty;
  
! 	static _Ty __cdecl min __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return minimum value
  		return (-_LLONG_MAX - _C2);
  		}
  
! 	static _Ty __cdecl max __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return maximum value
  		return (_LLONG_MAX);
  		}
*************** template<> class _CRTIMP2 numeric_limits
*** 791,802 ****
  public:
  	typedef _ULONGLONG _Ty;
  
! 	static _Ty (__cdecl min)() _THROW0()
  		{	// return minimum value
  		return (0);
  		}
  
! 	static _Ty (__cdecl max)() _THROW0()
  		{	// return maximum value
  		return (_ULLONG_MAX);
  		}
--- 792,803 ----
  public:
  	typedef _ULONGLONG _Ty;
  
! 	static _Ty __cdecl min __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return minimum value
  		return (0);
  		}
  
! 	static _Ty __cdecl max __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return maximum value
  		return (_ULLONG_MAX);
  		}
*************** template<> class _CRTIMP2 numeric_limits
*** 845,856 ****
  public:
  	typedef float _Ty;
  
! 	static _Ty (__cdecl min)() _THROW0()
  		{	// return minimum value
  		return (FLT_MIN);
  		}
  
! 	static _Ty (__cdecl max)() _THROW0()
  		{	// return maximum value
  		return (FLT_MAX);
  		}
--- 846,857 ----
  public:
  	typedef float _Ty;
  
! 	static _Ty __cdecl min __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return minimum value
  		return (FLT_MIN);
  		}
  
! 	static _Ty __cdecl max __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return maximum value
  		return (FLT_MAX);
  		}
*************** template<> class _CRTIMP2 numeric_limits
*** 900,911 ****
  public:
  	typedef double _Ty;
  
! 	static _Ty (__cdecl min)() _THROW0()
  		{	// return minimum value
  		return (DBL_MIN);
  		}
  
! 	static _Ty (__cdecl max)() _THROW0()
  		{	// return maximum value
  		return (DBL_MAX);
  		}
--- 901,912 ----
  public:
  	typedef double _Ty;
  
! 	static _Ty __cdecl min __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return minimum value
  		return (DBL_MIN);
  		}
  
! 	static _Ty __cdecl max __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return maximum value
  		return (DBL_MAX);
  		}
*************** template<> class _CRTIMP2 numeric_limits
*** 955,966 ****
  public:
  	typedef long double _Ty;
  
! 	static _Ty (__cdecl min)() _THROW0()
  		{	// return minimum value
  		return (LDBL_MIN);
  		}
  
! 	static _Ty (__cdecl max)() _THROW0()
  		{	// return maximum value
  		return (LDBL_MAX);
  		}
--- 956,967 ----
  public:
  	typedef long double _Ty;
  
! 	static _Ty __cdecl min __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return minimum value
  		return (LDBL_MIN);
  		}
  
! 	static _Ty __cdecl max __GCCXML_AVOID_MACRO_EXPANSION() _THROW0()
  		{	// return maximum value
  		return (LDBL_MAX);
  		}
Index: list
===================================================================
RCS file: /cvsroot/GxInclude/Vc7/Include/list,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -3 -p -r1.1 -r1.2
*** list	1 Nov 2002 14:00:28 -0000	1.1
--- list	21 Oct 2007 19:58:47 -0000	1.2
*************** public:
*** 233,239 ****
  
  		reference operator*() const
  			{	// return designated value
! 			return (_Myval(_Ptr));
  			}
  
  
--- 233,239 ----
  
  		reference operator*() const
  			{	// return designated value
! 			return (_Myval(this->_Ptr));
  			}
  
  
*************** public:
*** 244,250 ****
  
  		iterator& operator++()
  			{	// preincrement
! 			_Ptr = _Next(_Ptr);
  			return (*this);
  			}
  
--- 244,250 ----
  
  		iterator& operator++()
  			{	// preincrement
! 			this->_Ptr = _Next(this->_Ptr);
  			return (*this);
  			}
  
*************** public:
*** 257,263 ****
  
  		iterator& operator--()
  			{	// predecrement
! 			_Ptr = _Prev(_Ptr);
  			return (*this);
  			}
  
--- 257,263 ----
  
  		iterator& operator--()
  			{	// predecrement
! 			this->_Ptr = _Prev(this->_Ptr);
  			return (*this);
  			}
  
Index: ostream
===================================================================
RCS file: /cvsroot/GxInclude/Vc7/Include/ostream,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -3 -p -r1.1 -r1.2
*** ostream	1 Nov 2002 14:00:28 -0000	1.1
--- ostream	21 Oct 2007 19:58:47 -0000	1.2
*************** public:
*** 93,102 ****
  			{	// destroy the object
   #if _HAS_EXCEPTIONS
  			if (!uncaught_exception())
! 				_Myostr._Osfx();
  			}
   #else
! 			_Myostr._Osfx();
  		}
   #endif
  
--- 93,102 ----
  			{	// destroy the object
   #if _HAS_EXCEPTIONS
  			if (!uncaught_exception())
! 				this->_Myostr._Osfx();
  			}
   #else
! 			this->_Myostr._Osfx();
  		}
   #endif
  
Index: process.h
===================================================================
RCS file: /cvsroot/GxInclude/Vc7/Include/process.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -3 -p -r1.1 -r1.2
*** process.h	1 Nov 2002 14:00:28 -0000	1.1
--- process.h	1 Feb 2005 20:40:08 -0000	1.2
*************** _CRTIMP int __cdecl _wsystem(const wchar
*** 177,183 ****
   */
  intptr_t __cdecl _loaddll(char *);
  int __cdecl _unloaddll(intptr_t);
! int (__cdecl * __cdecl _getdllprocaddr(intptr_t, char *, intptr_t))();
  /* --------- The preceding functions are OBSOLETE --------- */
  
  
--- 177,184 ----
   */
  intptr_t __cdecl _loaddll(char *);
  int __cdecl _unloaddll(intptr_t);
! typedef int (__cdecl * _getdllprocaddr_type)();
! _getdllprocaddr_type __cdecl _getdllprocaddr(intptr_t, char *, intptr_t);
  /* --------- The preceding functions are OBSOLETE --------- */
  
  
Index: signal.h
===================================================================
RCS file: /cvsroot/GxInclude/Vc7/Include/signal.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -3 -p -r1.1 -r1.2
*** signal.h	1 Nov 2002 14:00:28 -0000	1.1
--- signal.h	17 May 2004 17:34:46 -0000	1.2
*************** extern void * _pxcptinfoptrs;
*** 89,95 ****
  
  /* Function prototypes */
  
! _CRTIMP void (__cdecl * __cdecl signal(int, void (__cdecl *)(int)))(int);
  _CRTIMP int __cdecl raise(int);
  
  
--- 89,96 ----
  
  /* Function prototypes */
  
! typedef void (__cdecl * __signal_handler_t)(int);
! _CRTIMP __signal_handler_t __cdecl signal(int, __signal_handler_t);
  _CRTIMP int __cdecl raise(int);
  
  
Index: stddef.h
===================================================================
RCS file: /cvsroot/GxInclude/Vc7/Include/stddef.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -3 -p -r1.1 -r1.2
*** stddef.h	1 Nov 2002 14:00:28 -0000	1.1
--- stddef.h	9 Jan 2009 13:47:14 -0000	1.2
*************** typedef unsigned short wchar_t;
*** 122,132 ****
--- 122,135 ----
  
  /* Define offsetof macro */
  
+ #define offsetof(s,m) ((size_t)__builtin_offsetof(s,m))
+ #if 0 /* replaced for gccxml */
  #ifdef  _WIN64
  #define offsetof(s,m)   (size_t)( (ptrdiff_t)&(((s *)0)->m) )
  #else
  #define offsetof(s,m)   (size_t)&(((s *)0)->m)
  #endif
+ #endif  /* 0 */
  
  
  #ifdef  _MT
Index: typeinfo.h
===================================================================
RCS file: /cvsroot/GxInclude/Vc7/Include/typeinfo.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -3 -p -r1.1 -r1.2
*** typeinfo.h	1 Nov 2002 14:00:28 -0000	1.1
--- typeinfo.h	17 May 2004 14:29:56 -0000	1.2
***************
*** 37,42 ****
--- 37,43 ----
  #endif  /* _DLL */
  #endif  /* _CRTIMP */
  
+ namespace std {
  class type_info {
  public:
      _CRTIMP virtual ~type_info();
*************** private:
*** 51,57 ****
      type_info(const type_info& rhs);
      type_info& operator=(const type_info& rhs);
  };
! 
  
  // This include must occur below the definition of class type_info
  #include <stdexcpt.h>
--- 52,59 ----
      type_info(const type_info& rhs);
      type_info& operator=(const type_info& rhs);
  };
! }
! using std::type_info;
  
  // This include must occur below the definition of class type_info
  #include <stdexcpt.h>
Index: valarray
===================================================================
RCS file: /cvsroot/GxInclude/Vc7/Include/valarray,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -3 -p -r1.1 -r1.2
*** valarray	1 Nov 2002 14:00:28 -0000	1.1
--- valarray	21 Oct 2007 19:58:47 -0000	1.2
***************
*** 5,10 ****
--- 5,12 ----
  #include <cmath>
  #include <xstddef>
  
+ #define __GCCXML_AVOID_MACRO_EXPANSION
+ 
  #pragma pack(push,8)
  #pragma warning(push,3)
  
*************** public:
*** 306,312 ****
  		return (_Sum);
  		}
  
! 	_Ty min() const
  		{	// return smallest of all elements
  		_Ty _Min = _Myptr[0];
  		for (size_t _Idx = 0; ++_Idx < size(); )
--- 308,314 ----
  		return (_Sum);
  		}
  
! 	_Ty min __GCCXML_AVOID_MACRO_EXPANSION() const
  		{	// return smallest of all elements
  		_Ty _Min = _Myptr[0];
  		for (size_t _Idx = 0; ++_Idx < size(); )
*************** public:
*** 315,321 ****
  		return (_Min);
  		}
  
! 	_Ty max() const
  		{	// return largest of all elements
  		_Ty _Max = _Myptr[0];
  		for (size_t _Idx = 0; ++_Idx < size(); )
--- 317,323 ----
  		return (_Min);
  		}
  
! 	_Ty max __GCCXML_AVOID_MACRO_EXPANSION() const
  		{	// return largest of all elements
  		_Ty _Max = _Myptr[0];
  		for (size_t _Idx = 0; ++_Idx < size(); )
Index: xdebug
===================================================================
RCS file: /cvsroot/GxInclude/Vc7/Include/xdebug,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -3 -p -r1.1 -r1.2
*** xdebug	1 Nov 2002 14:00:28 -0000	1.1
--- xdebug	21 Oct 2007 19:58:47 -0000	1.2
*************** template<class _Ty>
*** 53,59 ****
--- 53,61 ----
  	{	// delete from the debug CRT heap even if operator delete differs
  	if (_Ptr != 0)
  		{
+ #if 0
  		_Ptr->~_Ty();
+ #endif
  		// delete as _NORMAL_BLOCK, not _CRT_BLOCK, since we might have
  		// facets allocated by normal new.
  		free(_Ptr);
*************** template<class _Ty>
*** 66,71 ****
--- 68,75 ----
  	: public allocator<_Ty>
  	{	// an allocator which uses the debug CRT heap
  public:
+         typedef typename allocator<_Ty>::pointer pointer;
+         typedef typename allocator<_Ty>::size_type size_type;
  
  	template<class _Other>
  		struct rebind
Index: xlocale
===================================================================
RCS file: /cvsroot/GxInclude/Vc7/Include/xlocale,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -3 -p -r1.1 -r1.2
*** xlocale	1 Nov 2002 14:00:28 -0000	1.1
--- xlocale	1 Nov 2002 16:01:12 -0000	1.2
***************
*** 13,18 ****
--- 13,21 ----
  #pragma warning(push,3)
  
  _STD_BEGIN
+ class _CRTIMP2 locale;
+ template<class _Elem> class collate;
+ template<class _Facet> const _Facet& __cdecl use_facet(const locale& _Loc);
  
  		// TEMPLATE CLASS _Locbase
  template<class _Dummy>
Index: xstddef
===================================================================
RCS file: /cvsroot/GxInclude/Vc7/Include/xstddef,v
retrieving revision 1.1
retrieving revision 1.3
diff -c -3 -p -r1.1 -r1.3
*** xstddef	1 Nov 2002 14:00:28 -0000	1.1
--- xstddef	18 Mar 2003 20:42:54 -0000	1.3
*************** _STD_BEGIN
*** 22,28 ****
   #define _RERAISE	throw
  
   #define _THROW0()	throw ()
!  #define _THROW1(x)	throw (...)
   #define _THROW(x, y)	throw x(y)
   #else /* no exceptions */
   #define _TRY_BEGIN	{{
--- 22,28 ----
   #define _RERAISE	throw
  
   #define _THROW0()	throw ()
!  #define _THROW1(x)	throw (x)
   #define _THROW(x, y)	throw x(y)
   #else /* no exceptions */
   #define _TRY_BEGIN	{{
*************** _STD_BEGIN
*** 42,48 ****
   #define _TEMPLATE	template<>
  
   #ifndef _TEMPLATE_STAT
!   #define _TEMPLATE_STAT	template<>
   #endif
  
   #ifndef _TEMPLATE_MEMBER
--- 42,48 ----
   #define _TEMPLATE	template<>
  
   #ifndef _TEMPLATE_STAT
!   #define _TEMPLATE_STAT
   #endif
  
   #ifndef _TEMPLATE_MEMBER
Index: xstring
===================================================================
RCS file: /cvsroot/GxInclude/Vc7/Include/xstring,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -3 -p -r1.1 -r1.2
*** xstring	1 Nov 2002 14:00:28 -0000	1.1
--- xstring	21 Oct 2007 19:58:47 -0000	1.2
*************** private:
*** 1281,1289 ****
  template<class _Elem,
  	class _Traits,
  	class _Alloc>
! 	const /* typename */ basic_string<_Elem, _Traits, _Alloc>::size_type
  		basic_string<_Elem, _Traits, _Alloc>::npos =
! 			(basic_string<_Elem, _Traits, _Alloc>::size_type)(-1);
  
  typedef basic_string<char, char_traits<char>, allocator<char> >
  	string;
--- 1281,1289 ----
  template<class _Elem,
  	class _Traits,
  	class _Alloc>
! 	const typename basic_string<_Elem, _Traits, _Alloc>::size_type
  		basic_string<_Elem, _Traits, _Alloc>::npos =
! 			(typename basic_string<_Elem, _Traits, _Alloc>::size_type)(-1);
  
  typedef basic_string<char, char_traits<char>, allocator<char> >
  	string;
Index: xtree
===================================================================
RCS file: /cvsroot/GxInclude/Vc7/Include/xtree,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -3 -p -r1.1 -r1.2
*** xtree	1 Nov 2002 14:00:28 -0000	1.1
--- xtree	21 Oct 2007 19:58:47 -0000	1.2
*************** public:
*** 307,313 ****
  
  		reference operator*() const
  			{	// return designated value
! 			return (_Myval(_Ptr));
  			}
  
  		pointer operator->() const
--- 307,313 ----
  
  		reference operator*() const
  			{	// return designated value
! 			return (_Myval(this->_Ptr));
  			}
  
  		pointer operator->() const
*************** public:
*** 317,323 ****
  
  		iterator& operator++()
  			{	// preincrement
! 			_Inc();
  			return (*this);
  			}
  
--- 317,323 ----
  
  		iterator& operator++()
  			{	// preincrement
! 			this->_Inc();
  			return (*this);
  			}
  
*************** public:
*** 330,336 ****
  
  		iterator& operator--()
  			{	// predecrement
! 			_Dec();
  			return (*this);
  			}
  
--- 330,336 ----
  
  		iterator& operator--()
  			{	// predecrement
! 			this->_Dec();
  			return (*this);
  			}
  
Index: yvals.h
===================================================================
RCS file: /cvsroot/GxInclude/Vc7/Include/yvals.h,v
retrieving revision 1.1
retrieving revision 1.3
diff -c -3 -p -r1.1 -r1.3
*** yvals.h	1 Nov 2002 14:00:28 -0000	1.1
--- yvals.h	18 Mar 2005 22:21:50 -0000	1.3
*************** _STD_END
*** 93,100 ****
  		/* VC++ COMPILER PARAMETERS */
  #define _LONGLONG	__int64
  #define _ULONGLONG	unsigned __int64
! #define _LLONG_MAX	0x7fffffffffffffff
! #define _ULLONG_MAX	0xffffffffffffffff
  
  		/* INTEGER PROPERTIES */
  #define _C2			1	/* 0 if not 2's complement */
--- 93,100 ----
  		/* VC++ COMPILER PARAMETERS */
  #define _LONGLONG	__int64
  #define _ULONGLONG	unsigned __int64
! #define _LLONG_MAX	0x7fffffffffffffffi64
! #define _ULLONG_MAX	0xffffffffffffffffui64
  
  		/* INTEGER PROPERTIES */
  #define _C2			1	/* 0 if not 2's complement */