diff options
author | petewil <petewil@chromium.org> | 2015-12-21 10:48:36 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-12-21 18:49:26 +0000 |
commit | 61731d3ff51877ddb5f67aa3b937d5011a348d17 (patch) | |
tree | c0f148f8f53480e367276c8d349969e12486e5f7 /sandbox/win/src/policy_engine_processor.h | |
parent | 9575f9a4af9115c88bf8ba04e63a77e14e1d2750 (diff) | |
download | chromium_src-61731d3ff51877ddb5f67aa3b937d5011a348d17.zip chromium_src-61731d3ff51877ddb5f67aa3b937d5011a348d17.tar.gz chromium_src-61731d3ff51877ddb5f67aa3b937d5011a348d17.tar.bz2 |
Revert of Switch to standard integer types in sandbox/. (patchset #3 id:40001 of https://codereview.chromium.org/1538283002/ )
Reason for revert:
This appears to be causing a compile failure (macros.h omitted)
Original issue's description:
> Switch to standard integer types in sandbox/.
>
> BUG=138542
> TBR=cpu@chromium.org
>
> Committed: https://crrev.com/b5032dd2fd694a9bd7a9e96ad8fefcaf29c24c9e
> Cr-Commit-Position: refs/heads/master@{#366413}
TBR=cpu@chromium.org,avi@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=138542
Review URL: https://codereview.chromium.org/1539423002
Cr-Commit-Position: refs/heads/master@{#366428}
Diffstat (limited to 'sandbox/win/src/policy_engine_processor.h')
-rw-r--r-- | sandbox/win/src/policy_engine_processor.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/sandbox/win/src/policy_engine_processor.h b/sandbox/win/src/policy_engine_processor.h index 0d56896..9e416bd 100644 --- a/sandbox/win/src/policy_engine_processor.h +++ b/sandbox/win/src/policy_engine_processor.h @@ -5,12 +5,9 @@ #ifndef SANDBOX_SRC_POLICY_ENGINE_PROCESSOR_H__ #define SANDBOX_SRC_POLICY_ENGINE_PROCESSOR_H__ -#include <stddef.h> -#include <stdint.h> - -#include "base/macros.h" -#include "sandbox/win/src/policy_engine_opcodes.h" +#include "base/basictypes.h" #include "sandbox/win/src/policy_engine_params.h" +#include "sandbox/win/src/policy_engine_opcodes.h" namespace sandbox { @@ -69,15 +66,15 @@ enum PolicyResult { // TODO(cpu): implement the options kStopOnErrors & kRankedEval. // // Stop evaluating as soon as an error is encountered. -const uint32_t kStopOnErrors = 1; +const uint32 kStopOnErrors = 1; // Ignore all non fatal opcode evaluation errors. -const uint32_t kIgnoreErrors = 2; +const uint32 kIgnoreErrors = 2; // Short-circuit evaluation: Only evaluate until opcode group that // evaluated to true has been found. -const uint32_t kShortEval = 4; +const uint32 kShortEval = 4; // Discussed briefly at the policy design meeting. It will evaluate // all rules and then return the 'best' rule that evaluated true. -const uint32_t kRankedEval = 8; +const uint32 kRankedEval = 8; // This class evaluates a policy-opcode stream given the memory where the // opcodes are and an input 'parameter set'. @@ -122,7 +119,7 @@ class PolicyProcessor { // Evaluates a policy-opcode stream. See the comments at the top of this // class for more info. Returns POLICY_MATCH if a rule set was found that // matches an active policy. - PolicyResult Evaluate(uint32_t options, + PolicyResult Evaluate(uint32 options, ParameterSet* parameters, size_t parameter_count); |