Merge pull request #15 from awslabs/FB-mbstate

JonathanHenson · JonathanHenson · commit cf730ad86794 · 2016-06-02T16:33:05.000-07:00
Fb mbstate
diff --git a/aws-cpp-sdk-core/include/aws/core/utils/crypto/CryptoBuf.h b/aws-cpp-sdk-core/include/aws/core/utils/crypto/CryptoBuf.h
@@ -24,11 +24,7 @@ namespace Aws
     {
         namespace Crypto
         {
-#ifdef _MSC_VER
-            typedef _Mbstatet FPOS_TYPE;
-#else
-            typedef __mbstate_t FPOS_TYPE;
-#endif
+            typedef std::mbstate_t FPOS_TYPE;
             static const size_t DEFAULT_BUF_SIZE = 1024;
             static const size_t PUT_BACK_SIZE = 1;
 
@@ -160,4 +156,4 @@ namespace Aws
             };
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -24,11 +24,7 @@ namespace Aws`
`24`	`24`	`{`
`25`	`25`	`namespace Crypto`
`26`	`26`	`{`
`27`		`-#ifdef _MSC_VER`
`28`		`- typedef _Mbstatet FPOS_TYPE;`
`29`		`-#else`
`30`		`- typedef __mbstate_t FPOS_TYPE;`
`31`		`-#endif`
	`27`	`+ typedef std::mbstate_t FPOS_TYPE;`
`32`	`28`	`static const size_t DEFAULT_BUF_SIZE = 1024;`
`33`	`29`	`static const size_t PUT_BACK_SIZE = 1;`
`34`	`30`
`@@ -160,4 +156,4 @@ namespace Aws`
`160`	`156`	`};`
`161`	`157`	`}`
`162`	`158`	`}`
`163`		`-}`
	`159`	`+}`