Ticket #1188: headers__clean_up__includes.patch

File headers__clean_up__includes.patch, 1.6 KB (added by bpowers, 2 years ago)
  • source/orange/errors.hpp

    # HG changeset patch
    # User Bobby Powers <bobby@socialcodeinc.com>
    # Date 1337748023 14400
    # Node ID 5e3495fed55e3f1b51c0d225efc4839c97c9324b
    # Parent  b8aa6191819fe2eaaef2c714db03558e3ad8f6d8
    headers: clean up #includes
    
    This both reduces noise and fixes a build error from my distro's gcc
    4.7.
    
    diff --git a/source/orange/errors.hpp b/source/orange/errors.hpp
    a b  
    2222#define __ERRORS_HPP 
    2323 
    2424#include <string> 
     25#include "px/orange_globals.hpp" 
    2526 
    2627using namespace std; 
    2728 
     
    4647}; 
    4748#endif 
    4849 
    49 #include "garbage.hpp" 
    50  
    5150void ORANGE_API raiseError(const char *anerr, ...); 
    5251void ORANGE_API raiseErrorWho(const char *who, const char *anerr, ...); 
    5352 
  • source/orange/garbage.hpp

    diff --git a/source/orange/garbage.hpp b/source/orange/garbage.hpp
    a b  
    5555 
    5656// Not the most appropriate, but surely the most suitable place: 
    5757#include "px/orange_globals.hpp" 
     58#include "errors.hpp" 
    5859 
    5960#define WRAPPER ORANGE_WRAPPER 
    6061#define VWRAPPER ORANGE_VWRAPPER 
  • source/orange/getarg.cpp

    diff --git a/source/orange/getarg.cpp b/source/orange/getarg.cpp
    a b  
    2424#include "stladdon.hpp" 
    2525#include "errors.hpp" 
    2626#include <stdio.h> 
    27  
     27#include <string.h> 
    2828 
    2929TProgArguments::TProgArguments() : 
    3030allowSpaces(false) 
  • source/orange/root.hpp

    diff --git a/source/orange/root.hpp b/source/orange/root.hpp
    a b  
    2222#ifndef __ROOT_HPP 
    2323#define __ROOT_HPP 
    2424 
     25#include "errors.hpp" 
    2526#include "garbage.hpp" 
    26 #include "errors.hpp" 
    2727 
    2828 
    2929class TValue;