commit 046deb9b2050ebdf98a41e2d22f852e104dd365a
author pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Apr 09 09:06:11 2013 +0000
committer pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Apr 09 09:06:11 2013 +0000
tree cd92b3b39cc0ac245e19dacad1686e7ba003eff2
parent 29758de9b6313cc4288fbc77c40bce471d3ca5e2

WebRtc_Word32 -> int32_t in system_wrappers

BUG=314

Review URL: https://webrtc-codereview.appspot.com/1301004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3791 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/system_wrappers/source/trace_impl.h

diff --git a/webrtc/system_wrappers/source/trace_impl.h b/webrtc/system_wrappers/source/trace_impl.h
index 7971615..9e6e0a2 100644
--- a/webrtc/system_wrappers/source/trace_impl.h
+++ b/webrtc/system_wrappers/source/trace_impl.h
@@ -48,15 +48,13 @@
   static TraceImpl* CreateInstance();
   static TraceImpl* GetTrace(const TraceLevel level = kTraceAll);
 
-  WebRtc_Word32 SetTraceFileImpl(const char* file_name,
-                                 const bool add_file_counter);
-  WebRtc_Word32 TraceFileImpl(
-    char file_name[FileWrapper::kMaxFileNameSize]);
+  int32_t SetTraceFileImpl(const char* file_name, const bool add_file_counter);
+  int32_t TraceFileImpl(char file_name[FileWrapper::kMaxFileNameSize]);
 
-  WebRtc_Word32 SetTraceCallbackImpl(TraceCallback* callback);
+  int32_t SetTraceCallbackImpl(TraceCallback* callback);
 
   void AddImpl(const TraceLevel level, const TraceModule module,
-               const WebRtc_Word32 id, const char* msg);
+               const int32_t id, const char* msg);
 
   bool StopThread();
 
@@ -68,14 +66,14 @@
   static TraceImpl* StaticInstance(CountOperation count_operation,
                                    const TraceLevel level = kTraceAll);
 
-  WebRtc_Word32 AddThreadId(char* trace_message) const;
+  int32_t AddThreadId(char* trace_message) const;
 
   // OS specific implementations.
-  virtual WebRtc_Word32 AddTime(char* trace_message,
-                                const TraceLevel level) const = 0;
+  virtual int32_t AddTime(char* trace_message,
+                          const TraceLevel level) const = 0;
 
-  virtual WebRtc_Word32 AddBuildInfo(char* trace_message) const = 0;
-  virtual WebRtc_Word32 AddDateTimeInfo(char* trace_message) const = 0;
+  virtual int32_t AddBuildInfo(char* trace_message) const = 0;
+  virtual int32_t AddDateTimeInfo(char* trace_message) const = 0;
 
   static bool Run(void* obj);
   bool Process();
@@ -83,36 +81,36 @@
  private:
   friend class Trace;
 
-  WebRtc_Word32 AddLevel(char* sz_message, const TraceLevel level) const;
+  int32_t AddLevel(char* sz_message, const TraceLevel level) const;
 
-  WebRtc_Word32 AddModuleAndId(char* trace_message, const TraceModule module,
-                               const WebRtc_Word32 id) const;
+  int32_t AddModuleAndId(char* trace_message, const TraceModule module,
+                         const int32_t id) const;
 
-  WebRtc_Word32 AddMessage(char* trace_message,
-                           const char msg[WEBRTC_TRACE_MAX_MESSAGE_SIZE],
-                           const WebRtc_UWord16 written_so_far) const;
+  int32_t AddMessage(char* trace_message,
+                     const char msg[WEBRTC_TRACE_MAX_MESSAGE_SIZE],
+                     const uint16_t written_so_far) const;
 
   void AddMessageToList(
     const char trace_message[WEBRTC_TRACE_MAX_MESSAGE_SIZE],
-    const WebRtc_UWord16 length,
+    const uint16_t length,
     const TraceLevel level);
 
   bool UpdateFileName(
     const char file_name_utf8[FileWrapper::kMaxFileNameSize],
     char file_name_with_counter_utf8[FileWrapper::kMaxFileNameSize],
-    const WebRtc_UWord32 new_count) const;
+    const uint32_t new_count) const;
 
   bool CreateFileName(
     const char file_name_utf8[FileWrapper::kMaxFileNameSize],
     char file_name_with_counter_utf8[FileWrapper::kMaxFileNameSize],
-    const WebRtc_UWord32 new_count) const;
+    const uint32_t new_count) const;
 
   void WriteToFile();
 
   CriticalSectionWrapper* critsect_interface_;
   TraceCallback* callback_;
-  WebRtc_UWord32 row_count_text_;
-  WebRtc_UWord32 file_count_text_;
+  uint32_t row_count_text_;
+  uint32_t file_count_text_;
 
   FileWrapper& trace_file_;
   ThreadWrapper& thread_;
@@ -120,11 +118,11 @@
 
   // critsect_array_ protects active_queue_.
   CriticalSectionWrapper* critsect_array_;
-  WebRtc_UWord16 next_free_idx_[WEBRTC_TRACE_NUM_ARRAY];
+  uint16_t next_free_idx_[WEBRTC_TRACE_NUM_ARRAY];
   TraceLevel level_[WEBRTC_TRACE_NUM_ARRAY][WEBRTC_TRACE_MAX_QUEUE];
-  WebRtc_UWord16 length_[WEBRTC_TRACE_NUM_ARRAY][WEBRTC_TRACE_MAX_QUEUE];
+  uint16_t length_[WEBRTC_TRACE_NUM_ARRAY][WEBRTC_TRACE_MAX_QUEUE];
   char* message_queue_[WEBRTC_TRACE_NUM_ARRAY][WEBRTC_TRACE_MAX_QUEUE];
-  WebRtc_UWord8 active_queue_;
+  uint8_t active_queue_;
 };
 
 }  // namespace webrtc