31,32c31
< #include <iostream.h>
<
---
> #include <iostream>
43,46c42,45
< if (argc != 2) {
< cout << "Usage: " << argv[0] << " <number>\n";
< exit(1);
< }
---
> if (argc != 2) {
> cout << "Usage: " << argv[0] << " <number>\n";
> exit(1);
> }
48c47
< string s = argv[1];
---
> string s = argv[1];
51,64c50,63
< valtype value; \
< cout << "TYPE = " #valtype "\n"; \
< if (to_number(s, value)) { \
< cout << "Number(" << s << ") = " << dec \
< << (unsigned long long)(unsigned type)value << "\n" \
< << "Number(" << s << ") = " << dec \
< << (signed long long)(signed type)value << "\n" \
< << "Number(" << s << ") = 0x" << hex \
< << (unsigned long long)(unsigned type)value << "\n" \
< << "Number(" << s << ") = 0" << oct \
< << (unsigned long long)(unsigned type)value << "\n\n"; \
< } else \
< cout << "Number(" << s << ") is invalid\n\n"; \
< } while (0)
---
> valtype value; \
> cout << "TYPE = " #valtype "\n"; \
> if (to_number(s, value)) { \
> cout << "Number(" << s << ") = " << dec \
> << (unsigned long long)(unsigned type)value << "\n" \
> << "Number(" << s << ") = " << dec \
> << (signed long long)(signed type)value << "\n" \
> << "Number(" << s << ") = 0x" << hex \
> << (unsigned long long)(unsigned type)value << "\n" \
> << "Number(" << s << ") = 0" << oct \
> << (unsigned long long)(unsigned type)value << "\n\n"; \
> } else \
> cout << "Number(" << s << ") is invalid\n\n"; \
> } while (0)
66,75c65,74
< OUTVAL(signed long long, long long);
< OUTVAL(unsigned long long, long long);
< OUTVAL(signed long, long);
< OUTVAL(unsigned long, long);
< OUTVAL(signed int, int);
< OUTVAL(unsigned int, int);
< OUTVAL(signed short, short);
< OUTVAL(unsigned short, short);
< OUTVAL(signed char, char);
< OUTVAL(unsigned char, char);
---
> OUTVAL(signed long long, long long);
> OUTVAL(unsigned long long, long long);
> OUTVAL(signed long, long);
> OUTVAL(unsigned long, long);
> OUTVAL(signed int, int);
> OUTVAL(unsigned int, int);
> OUTVAL(signed short, short);
> OUTVAL(unsigned short, short);
> OUTVAL(signed char, char);
> OUTVAL(unsigned char, char);
77c76
< return 0;
---
> return 0;