diff options
| author | Tim Foley <tfoley@nvidia.com> | 2017-06-15 13:24:25 -0700 |
|---|---|---|
| committer | Tim Foley <tfoley@nvidia.com> | 2017-06-15 13:24:25 -0700 |
| commit | 205187b561c3b31fa931e73e8f7263f0c4b1de41 (patch) | |
| tree | 7bd2cd5ae3c14416b71ef8319ff02ace429d1132 /source/slang/slang.cpp | |
| parent | 517513645afb8eaf4841e7b7035f1ba3a9c7cd57 (diff) | |
Rename `CoreLib::*` to `Slang`
Getting rid of more namespace complexity and stripping things down to the basics.
This also gets rid of some dead code in the "core" library.
Diffstat (limited to 'source/slang/slang.cpp')
| -rw-r--r-- | source/slang/slang.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp index 9f64edc7f..ce48f9032 100644 --- a/source/slang/slang.cpp +++ b/source/slang/slang.cpp @@ -17,9 +17,6 @@ #undef NOMINMAX #endif -using namespace CoreLib::Basic; -using namespace CoreLib::IO; - namespace Slang { static void stdlibDiagnosticCallback( @@ -37,7 +34,7 @@ class Session { public: bool useCache = false; - CoreLib::String cacheDir; + String cacheDir; RefPtr<Scope> slangLanguageScope; RefPtr<Scope> hlslLanguageScope; @@ -46,7 +43,7 @@ public: List<RefPtr<ProgramSyntaxNode>> loadedModuleCode; - Session(bool /*pUseCache*/, CoreLib::String /*pCacheDir*/) + Session(bool /*pUseCache*/, String /*pCacheDir*/) { // Initialize global state // TODO: move this into the session instead @@ -136,10 +133,10 @@ struct CompileRequest List<String> searchDirs; virtual bool TryToFindIncludeFile( - CoreLib::String const& pathToInclude, - CoreLib::String const& pathIncludedFrom, - CoreLib::String* outFoundPath, - CoreLib::String* outFoundSource) override + String const& pathToInclude, + String const& pathIncludedFrom, + String* outFoundPath, + String* outFoundSource) override { String path = Path::Combine(Path::GetDirectoryName(pathIncludedFrom), pathToInclude); if (File::Exists(path)) |