diff --git a/libraries/platform/src/MACOSPlatform.h b/libraries/platform/src/MACOSPlatform.h index 71953d1d1a..44861eba41 100644 --- a/libraries/platform/src/MACOSPlatform.h +++ b/libraries/platform/src/MACOSPlatform.h @@ -12,9 +12,6 @@ #include "platform.h" namespace platform { - - using namespace nlohmann; - class MACOSInstance : public Instance { public: diff --git a/libraries/platform/src/WINPlatform.h b/libraries/platform/src/WINPlatform.h index 35ad2bf964..20efe63bad 100644 --- a/libraries/platform/src/WINPlatform.h +++ b/libraries/platform/src/WINPlatform.h @@ -12,9 +12,6 @@ #include "platform.h" namespace platform { - - using namespace nlohmann; - class WINInstance : public Instance { public: diff --git a/libraries/platform/src/platform.h b/libraries/platform/src/platform.h index 3c28836a7f..8ad68e2019 100644 --- a/libraries/platform/src/platform.h +++ b/libraries/platform/src/platform.h @@ -12,7 +12,6 @@ #include #include - namespace platform { using json = nlohmann::json; @@ -39,7 +38,6 @@ protected: std::vector _memory; std::vector _gpu; std::vector _display; - }; //Platform level functions @@ -56,6 +54,7 @@ const json* getGraphics(int index); int getNumDisplay(); const json* getDisplay(int index); + int getNumMemory(); const json* getMemory(int index);