Browse Source

Fixed build.

Branimir Karadžić 7 years ago
parent
commit
f1c5b0bb9b
2 changed files with 23 additions and 16 deletions
  1. 12 9
      tests/math_bench.cpp
  2. 11 7
      tools/bin2c/bin2c.cpp

+ 12 - 9
tests/math_bench.cpp

@@ -25,8 +25,10 @@ float mathTest(const char* _name)
 		result += mfn(xx);
 	}
 
+	bx::Error err;
+
 	elapsed += bx::getHPCounter();
-	bx::writePrintf(writer, "%-20s: %15f\n", _name, double(elapsed) );
+	bx::write(writer, &err, "%-20s: %15f\n", _name, double(elapsed) );
 
 	return result;
 }
@@ -39,40 +41,41 @@ float rsqrt(float _a)
 void math_bench()
 {
 	bx::WriterI* writer = bx::getStdOut();
-	bx::writePrintf(writer, "Math bench\n\n");
+	bx::Error err;
+	bx::write(writer, &err, "Math bench\n\n");
 
 	mathTest<  ::sqrtf    >("  ::sqrtf");
 	mathTest<bx::sqrtRef  >("bx::sqrtRef");
 	mathTest<bx::sqrtSimd >("bx::sqrtSimd");
 	mathTest<bx::sqrt     >("bx::sqrt");
 
-	bx::writePrintf(writer, "\n");
+	bx::write(writer, &err, "\n");
 	mathTest<  ::rsqrt    >("  ::rsqrtf");
 	mathTest<bx::rsqrtRef >("bx::rsqrtRef");
 	mathTest<bx::rsqrtSimd>("bx::rsqrtSimd");
 	mathTest<bx::rsqrt    >("bx::rsqrt");
 
-	bx::writePrintf(writer, "\n");
+	bx::write(writer, &err, "\n");
 	mathTest<  ::sinf >("  ::sinf");
 	mathTest<bx::sin  >("bx::sin");
 
-	bx::writePrintf(writer, "\n");
+	bx::write(writer, &err, "\n");
 	mathTest<  ::asinf>("  ::asinf");
 	mathTest<bx::asin >("bx::asin");
 
-	bx::writePrintf(writer, "\n");
+	bx::write(writer, &err, "\n");
 	mathTest<  ::cosf >("  ::cosf");
 	mathTest<bx::cos  >("bx::cos");
 
-	bx::writePrintf(writer, "\n");
+	bx::write(writer, &err, "\n");
 	mathTest<  ::acosf>("  ::acosf");
 	mathTest<bx::acos >("bx::acos");
 
-	bx::writePrintf(writer, "\n");
+	bx::write(writer, &err, "\n");
 	mathTest<  ::tanf >("  ::tanf");
 	mathTest<bx::tan  >("bx::tan");
 
-	bx::writePrintf(writer, "\n");
+	bx::write(writer, &err, "\n");
 	mathTest<  ::atanf>("  ::atanf");
 	mathTest<bx::atan >("bx::atan");
 }

+ 11 - 7
tools/bin2c/bin2c.cpp

@@ -35,8 +35,11 @@ public:
 		const char* data = (const char*)m_mb.more(0);
 		uint32_t size = uint32_t(bx::seek(&m_mw) );
 
-		bx::writePrintf(
+		bx::Error err;
+
+		bx::write(
 			  m_writer
+			, &err
 			, "static const uint8_t %.*s[%d] =\n{\n"
 			, m_name.getLength()
 			, m_name.getPtr()
@@ -60,7 +63,7 @@ public:
 				if (HEX_DUMP_WIDTH == asciiPos)
 				{
 					ascii[asciiPos] = '\0';
-					bx::writePrintf(m_writer, "\t" HEX_DUMP_FORMAT "// %s\n", hex, ascii);
+					bx::write(m_writer, &err, "\t" HEX_DUMP_FORMAT "// %s\n", hex, ascii);
 					data += asciiPos;
 					hexPos   = 0;
 					asciiPos = 0;
@@ -70,11 +73,11 @@ public:
 			if (0 != asciiPos)
 			{
 				ascii[asciiPos] = '\0';
-				bx::writePrintf(m_writer, "\t" HEX_DUMP_FORMAT "// %s\n", hex, ascii);
+				bx::write(m_writer, &err, "\t" HEX_DUMP_FORMAT "// %s\n", hex, ascii);
 			}
 		}
 
-		bx::writePrintf(m_writer, "};\n");
+		bx::write(m_writer, &err, "};\n");
 #undef HEX_DUMP_WIDTH
 #undef HEX_DUMP_SPACE_WIDTH
 #undef HEX_DUMP_FORMAT
@@ -88,19 +91,20 @@ public:
 void help(const char* _error = NULL)
 {
 	bx::WriterI* stdOut = bx::getStdOut();
+	bx::Error err;
 
 	if (NULL != _error)
 	{
-		bx::writePrintf(stdOut, "Error:\n%s\n\n", _error);
+		bx::write(stdOut, &err, "Error:\n%s\n\n", _error);
 	}
 
-	bx::writePrintf(stdOut
+	bx::write(stdOut, &err
 		, "bin2c, binary to C\n"
 		  "Copyright 2011-2018 Branimir Karadzic. All rights reserved.\n"
 		  "License: https://github.com/bkaradzic/bx#license-bsd-2-clause\n\n"
 		);
 
-	bx::writePrintf(stdOut
+	bx::write(stdOut, &err
 		, "Usage: bin2c -f <in> -o <out> -n <name>\n"
 		  "\n"
 		  "Options:\n"