From 092ec213818c1c3f94e4750f80bf1186703944d9 Mon Sep 17 00:00:00 2001
From: Ryan Dahl <ry@tinyclouds.org>
Date: Sun, 10 Jun 2018 02:24:34 +0200
Subject: [PATCH] Wrap deno library in a namespace.

---
 deno2/deno.cc             | 4 ++++
 deno2/deno.h              | 4 ++++
 deno2/main.cc             | 8 ++++----
 deno2/snapshot_creator.cc | 4 ++--
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/deno2/deno.cc b/deno2/deno.cc
index d428797807..8ef673449b 100644
--- a/deno2/deno.cc
+++ b/deno2/deno.cc
@@ -32,6 +32,8 @@ IN THE SOFTWARE.
 
 #define CHECK(x) assert(x)  // TODO(ry) use V8's CHECK.
 
+namespace deno {
+
 // Extracts a C string from a v8::V8 Utf8Value.
 const char* ToCString(const v8::String::Utf8Value& value) {
   return *value ? *value : "<string conversion failed>";
@@ -354,3 +356,5 @@ void deno_dispose(Deno* d) {
 }
 
 void deno_terminate_execution(Deno* d) { d->isolate->TerminateExecution(); }
+
+}  // namespace deno
diff --git a/deno2/deno.h b/deno2/deno.h
index f2a9e7294d..2fadfd983b 100644
--- a/deno2/deno.h
+++ b/deno2/deno.h
@@ -6,6 +6,8 @@
 #include <string>
 #include "v8/include/v8.h"
 
+namespace deno {
+
 // Data that gets transmitted.
 struct buf_s {
   void* data;
@@ -52,4 +54,6 @@ const char* deno_last_exception(Deno* d);
 void deno_dispose(Deno* d);
 void deno_terminate_execution(Deno* d);
 
+}  // namespace deno
+
 #endif  // DENO_H_
diff --git a/deno2/main.cc b/deno2/main.cc
index b5c703b55c..5d8263d28c 100644
--- a/deno2/main.cc
+++ b/deno2/main.cc
@@ -10,7 +10,7 @@
 #include "snapshot_deno.cc"
 
 int main(int argc, char** argv) {
-  v8_init();
+  deno::v8_init();
 
   auto natives_blob = *StartupBlob_natives();
   printf("natives_blob %d bytes\n", natives_blob.raw_size);
@@ -21,10 +21,10 @@ int main(int argc, char** argv) {
   v8::V8::SetNativesDataBlob(&natives_blob);
   v8::V8::SetSnapshotDataBlob(&snapshot_blob);
 
-  Deno* d = deno_from_snapshot(&snapshot_blob, NULL, NULL);
-  int r = deno_load(d, "main2.js", "foo();");
+  deno::Deno* d = deno::deno_from_snapshot(&snapshot_blob, NULL, NULL);
+  int r = deno::deno_load(d, "main2.js", "foo();");
   if (r != 0) {
-    printf("Error! %s\n", deno_last_exception(d));
+    printf("Error! %s\n", deno::deno_last_exception(d));
     exit(1);
   }
 
diff --git a/deno2/snapshot_creator.cc b/deno2/snapshot_creator.cc
index 4001abe6e4..1aaa958d01 100644
--- a/deno2/snapshot_creator.cc
+++ b/deno2/snapshot_creator.cc
@@ -125,7 +125,7 @@ int main(int argc, char** argv) {
   const char* natives_out_cc = argv[4];
   const char* snapshot_out_cc = argv[5];
 
-  v8_init();
+  deno::v8_init();
 
   auto js_data = ReadFile(js_fn);
   auto natives_blob = ReadFile(natives_in_bin);
@@ -134,7 +134,7 @@ int main(int argc, char** argv) {
   v8::V8::SetNativesDataBlob(&natives_blob);
   v8::V8::SetSnapshotDataBlob(&snapshot_in_blob);
 
-  auto snapshot_blob = deno_make_snapshot(js_fn, js_data.data);
+  auto snapshot_blob = deno::deno_make_snapshot(js_fn, js_data.data);
 
   StartupDataCppWriter nativesWriter("natives", natives_out_cc, natives_blob);
   nativesWriter.Write();