Merge branch 'cheukyin699-master' into develop

anhero · Feb 9, 2015 · 3c3b064 · 3c3b064
2 parents bc4dff6 + 3f620f2
commit 3c3b064
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/examples/main.cpp b/examples/main.cpp
@@ -1,28 +1,28 @@
 #include <iostream>
 #include <string>
 
-#include "JsonBox/Value.h"
+#include "JsonBox.h"
 
 int main (int argc, const char * argv[]) {
-	/*JsonBox::Object o;
+	JsonBox::Object o;
 	o["myName"] = JsonBox::Value(123);
 	o["myOtherMember"] = JsonBox::Value("asld\\kfn");
 	o["hahaha"] = JsonBox::Value(true);
 	o["adamo"] = JsonBox::Value(129.09);
 	std::cout << o << std::endl;
 	JsonBox::Value v(o);
-	v.writeToFile("path to your file");*/
+	v.writeToFile("file.json");
 
-	/*JsonBox::Array a;
+	JsonBox::Array a;
 	a.push_back(JsonBox::Value("I'm a string..."));
 	a.push_back(JsonBox::Value(123));
-	std::cout << a << std::endl;*/
+	std::cout << a << std::endl;
 
-	//JsonBox::Value v2;
-	//v2.loadFromFile("path to your file");
-	//std::cout << v2 << std::endl;
-	//v2.writeToStream(std::cout, true, true);
-	//v2.writeToFile("path to your file", false, false);
-    return 0;
+	JsonBox::Value v2;
+	v2.loadFromFile("file.json");
+	std::cout << v2 << std::endl;
+	v2.writeToStream(std::cout, true, true);
+	v2.writeToFile("file.json", false, false);
+	return 0;
 }