From ad049a15b43b7ddba3fe7d0a898652fc8022629d Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Tue, 22 Apr 2014 11:46:23 -0700
Subject: Use strict ID types
Possibly some missing for the far side of the network.
AccountId and BlockId are still terribly entangled.
---
src/io/cxxstdio.hpp | 14 ++++++++++----
src/io/write.hpp | 2 +-
2 files changed, 11 insertions(+), 5 deletions(-)
(limited to 'src/io')
diff --git a/src/io/cxxstdio.hpp b/src/io/cxxstdio.hpp
index 8061d15..479707a 100644
--- a/src/io/cxxstdio.hpp
+++ b/src/io/cxxstdio.hpp
@@ -226,7 +226,8 @@ namespace cxxstdio
cxxstdio::PrintFormatter<format_impl>::print(out, ## __VA_ARGS__); \
})
-# define XSCANF(out, fmt, ...) \
+# if 0
+# define XSCANF(out, fmt, ...) \
({ \
struct format_impl \
{ \
@@ -235,14 +236,19 @@ namespace cxxstdio
}; \
cxxstdio::ScanFormatter<format_impl>::scan(out, ## __VA_ARGS__); \
})
+# endif
# define FPRINTF(file, fmt, ...) XPRINTF(/*no_cast<FILE *>*/(file), fmt, ## __VA_ARGS__)
-# define FSCANF(file, fmt, ...) XSCANF(no_cast<FILE *>(file), fmt, ## __VA_ARGS__)
+# if 0
+# define FSCANF(file, fmt, ...) XSCANF(no_cast<FILE *>(file), fmt, ## __VA_ARGS__)
+# endif
# define PRINTF(fmt, ...) FPRINTF(stdout, fmt, ## __VA_ARGS__)
# define SPRINTF(str, fmt, ...) XPRINTF(base_cast<AString&>(str), fmt, ## __VA_ARGS__)
# define SNPRINTF(str, n, fmt, ...) XPRINTF(base_cast<VString<n-1>&>(str), fmt, ## __VA_ARGS__)
-# define SCANF(fmt, ...) FSCANF(stdin, fmt, ## __VA_ARGS__)
-# define SSCANF(str, fmt, ...) XSCANF(maybe_cast<ZString>(str), fmt, ## __VA_ARGS__)
+# if 0
+# define SCANF(fmt, ...) FSCANF(stdin, fmt, ## __VA_ARGS__)
+# define SSCANF(str, fmt, ...) XSCANF(maybe_cast<ZString>(str), fmt, ## __VA_ARGS__)
+# endif
# define STRPRINTF(fmt, ...) \
({ \
diff --git a/src/io/write.hpp b/src/io/write.hpp
index 39d3dee..1d67494 100644
--- a/src/io/write.hpp
+++ b/src/io/write.hpp
@@ -19,7 +19,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-# include "../sanity.hpp"
+# include "fwd.hpp"
# include <cstdarg>
--
cgit v1.2.3-70-g09d2