Use C-style system headers in C++ code to avoid issues with std:: namespace

This commit is contained in:
Ian Romanick
2011-02-10 10:26:42 -08:00
parent 5a1fbf0f70
commit 497baf4e4a
25 changed files with 8 additions and 58 deletions

View File

@@ -20,12 +20,9 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE. * DEALINGS IN THE SOFTWARE.
*/ */
#include <cstdio> #include <assert.h>
#include <cassert>
#include "ast.h" #include "ast.h"
using std::printf;
const char * const char *
ast_expression::operator_string(enum ast_operators op) ast_expression::operator_string(enum ast_operators op)
{ {

View File

@@ -21,14 +21,11 @@
* DEALINGS IN THE SOFTWARE. * DEALINGS IN THE SOFTWARE.
*/ */
#include <cstdio>
#include "ast.h" #include "ast.h"
extern "C" { extern "C" {
#include "program/symbol_table.h" #include "program/symbol_table.h"
} }
using std::printf;
void void
ast_type_specifier::print(void) const ast_type_specifier::print(void) const
{ {

View File

@@ -31,7 +31,7 @@
#ifdef __cplusplus #ifdef __cplusplus
#include <cstdlib> #include <stdlib.h>
#include "glsl_symbol_table.h" #include "glsl_symbol_table.h"
enum _mesa_glsl_parser_targets { enum _mesa_glsl_parser_targets {

View File

@@ -21,7 +21,7 @@
* DEALINGS IN THE SOFTWARE. * DEALINGS IN THE SOFTWARE.
*/ */
#include <cstdio> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "main/core.h" /* for Elements */ #include "main/core.h" /* for Elements */
#include "glsl_symbol_table.h" #include "glsl_symbol_table.h"

View File

@@ -26,8 +26,8 @@
#ifndef GLSL_TYPES_H #ifndef GLSL_TYPES_H
#define GLSL_TYPES_H #define GLSL_TYPES_H
#include <cstring> #include <string.h>
#include <cassert> #include <assert.h>
extern "C" { extern "C" {
#include "GL/gl.h" #include "GL/gl.h"

View File

@@ -27,8 +27,6 @@
#include "ast.h" #include "ast.h"
#include "glsl_types.h" #include "glsl_types.h"
using std::strcmp;
ir_rvalue * ir_rvalue *
_mesa_ast_field_selection_to_hir(const ast_expression *expr, _mesa_ast_field_selection_to_hir(const ast_expression *expr,
exec_list *instructions, exec_list *instructions,

View File

@@ -26,8 +26,8 @@
#ifndef IR_H #ifndef IR_H
#define IR_H #define IR_H
#include <cstdio> #include <stdio.h>
#include <cstdlib> #include <stdlib.h>
#include "ralloc.h" #include "ralloc.h"
#include "glsl_types.h" #include "glsl_types.h"

View File

@@ -27,7 +27,6 @@
* *
* \author Ian Romanick * \author Ian Romanick
*/ */
#include <cstdio>
#include "ir.h" #include "ir.h"
#include "glsl_symbol_table.h" #include "glsl_symbol_table.h"

View File

@@ -25,9 +25,6 @@
#include "glsl_types.h" #include "glsl_types.h"
#include "glsl_parser_extras.h" #include "glsl_parser_extras.h"
using std::printf;
using std::strncmp;
static void print_type(const glsl_type *t); static void print_type(const glsl_type *t);
void void

View File

@@ -39,9 +39,6 @@
#include "program/hash_table.h" #include "program/hash_table.h"
#include "glsl_types.h" #include "glsl_types.h"
using std::abort;
using std::printf;
class ir_validate : public ir_hierarchical_visitor { class ir_validate : public ir_hierarchical_visitor {
public: public:
ir_validate() ir_validate()

View File

@@ -21,10 +21,6 @@
* DEALINGS IN THE SOFTWARE. * DEALINGS IN THE SOFTWARE.
*/ */
#include <cstdlib>
#include <cstdio>
#include <cstdarg>
#include "main/core.h" #include "main/core.h"
#include "glsl_symbol_table.h" #include "glsl_symbol_table.h"
#include "glsl_parser_extras.h" #include "glsl_parser_extras.h"

View File

@@ -63,10 +63,6 @@
* *
* \author Ian Romanick <ian.d.romanick@intel.com> * \author Ian Romanick <ian.d.romanick@intel.com>
*/ */
#include <cstdlib>
#include <cstdio>
#include <cstdarg>
#include <climits>
#include "main/core.h" #include "main/core.h"
#include "glsl_symbol_table.h" #include "glsl_symbol_table.h"

View File

@@ -21,7 +21,7 @@
* DEALINGS IN THE SOFTWARE. * DEALINGS IN THE SOFTWARE.
*/ */
#include <climits> #include <limits.h>
#include "main/compiler.h" #include "main/compiler.h"
#include "glsl_types.h" #include "glsl_types.h"
#include "loop_analysis.h" #include "loop_analysis.h"

View File

@@ -35,9 +35,6 @@
#include "ir_expression_flattening.h" #include "ir_expression_flattening.h"
#include "glsl_types.h" #include "glsl_types.h"
using std::abort;
using std::printf;
class ir_mat_op_to_vec_visitor : public ir_hierarchical_visitor { class ir_mat_op_to_vec_visitor : public ir_hierarchical_visitor {
public: public:
ir_mat_op_to_vec_visitor() ir_mat_op_to_vec_visitor()

View File

@@ -20,8 +20,6 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE. * DEALINGS IN THE SOFTWARE.
*/ */
#include <cstdlib>
#include <cstdio>
#include <getopt.h> #include <getopt.h>
#include "ast.h" #include "ast.h"

View File

@@ -41,8 +41,6 @@
#include "ir_optimization.h" #include "ir_optimization.h"
#include "glsl_types.h" #include "glsl_types.h"
using std::memset;
class acp_entry : public exec_node class acp_entry : public exec_node
{ {
public: public:

View File

@@ -37,9 +37,6 @@
#include "ir_optimization.h" #include "ir_optimization.h"
#include "glsl_types.h" #include "glsl_types.h"
using std::calloc;
using std::free;
struct assignment_entry { struct assignment_entry {
exec_node link; exec_node link;
int assignment_count; int assignment_count;

View File

@@ -32,8 +32,6 @@
#include "ir_variable_refcount.h" #include "ir_variable_refcount.h"
#include "glsl_types.h" #include "glsl_types.h"
using std::printf;
static bool debug = false; static bool debug = false;
/** /**

View File

@@ -38,8 +38,6 @@
#include "ir_optimization.h" #include "ir_optimization.h"
#include "glsl_types.h" #include "glsl_types.h"
using std::printf;
static bool debug = false; static bool debug = false;
class assignment_entry : public exec_node class assignment_entry : public exec_node

View File

@@ -32,8 +32,6 @@
#include "ir_expression_flattening.h" #include "ir_expression_flattening.h"
#include "glsl_types.h" #include "glsl_types.h"
using std::strcmp;
class signature_entry : public exec_node class signature_entry : public exec_node
{ {
public: public:

View File

@@ -38,9 +38,6 @@
#include "ir_rvalue_visitor.h" #include "ir_rvalue_visitor.h"
#include "glsl_types.h" #include "glsl_types.h"
using std::printf;
using std::strcmp;
static bool debug = false; static bool debug = false;
// XXX using variable_entry2 here to avoid collision (MSVC multiply-defined // XXX using variable_entry2 here to avoid collision (MSVC multiply-defined

View File

@@ -32,8 +32,6 @@
#include "ir_optimization.h" #include "ir_optimization.h"
#include "glsl_types.h" #include "glsl_types.h"
using std::memset;
class ir_swizzle_swizzle_visitor : public ir_hierarchical_visitor { class ir_swizzle_swizzle_visitor : public ir_hierarchical_visitor {
public: public:
ir_swizzle_swizzle_visitor() ir_swizzle_swizzle_visitor()

View File

@@ -54,8 +54,6 @@
#include "ir_optimization.h" #include "ir_optimization.h"
#include "glsl_types.h" #include "glsl_types.h"
using std::printf;
static bool debug = false; static bool debug = false;
class ir_tree_grafting_visitor : public ir_hierarchical_visitor { class ir_tree_grafting_visitor : public ir_hierarchical_visitor {

View File

@@ -22,9 +22,6 @@
* DEALINGS IN THE SOFTWARE. * DEALINGS IN THE SOFTWARE.
*/ */
#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <assert.h> #include <assert.h>
#include "s_expression.h" #include "s_expression.h"

View File

@@ -23,7 +23,6 @@
* DEALINGS IN THE SOFTWARE. * DEALINGS IN THE SOFTWARE.
*/ */
#include <cstdio>
#include "ir.h" #include "ir.h"
#include "glsl_types.h" #include "glsl_types.h"
#include "ir_visitor.h" #include "ir_visitor.h"