Merge pull request sass#1310 from saper/namespaces

Clean up C++ namespaces
scantist-ossops-m2 · Aug 11, 2015 · 354801c · 354801c
2 parents eadae5b + 2bb3708
commit 354801c
Show file tree

Hide file tree

Showing 80 changed files with 1,709 additions and 1,787 deletions.
diff --git a/include/sass2scss.h b/include/sass2scss.h
@@ -33,7 +33,6 @@
 #endif
 
 // using std::string
-using namespace std;
 
 // add namespace for c++
 namespace Sass
@@ -53,7 +52,7 @@ namespace Sass
 	const int SASS2SCSS_CONVERT_COMMENT = 128;
 
 	// String for finding something interesting
-	const string SASS2SCSS_FIND_WHITESPACE = " \t\n\v\f\r";
+	const std::string SASS2SCSS_FIND_WHITESPACE = " \t\n\v\f\r";
 
 	// converter struct
 	// holding all states
@@ -70,17 +69,17 @@ namespace Sass
 		// has semicolon
 		bool semicolon;
 		// comment context
-		string comment;
+		std::string comment;
 		// flag end of file
 		bool end_of_file;
 		// whitespace buffer
-		string whitespace;
+		std::string whitespace;
 		// context/block stack
-		stack<string> indents;
+		std::stack<std::string> indents;
 	};
 
 	// function only available in c++ code
-	char* sass2scss (const string& sass, const int options);
+	char* sass2scss (const std::string& sass, const int options);
 
 }
 // EO namespace
@@ -112,4 +111,4 @@ extern "C" {
 } // __cplusplus defined.
 #endif
 
-#endif
+#endif